#i21211#

Changes to support new uri format ( e.g. one that doesn't depend on old logical name -> function name mapping ). Briefly theses changes are temporary in that they basically make sure that the logical name and function name are the same. From the point of view of the parcel-descriptIon.xml the logical name is ignored. Also updated the ExampleSpreadSheet.scx with new binding to reflect the changes.

scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScriptBrowseNode.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dfoster $ $Date: 2003-10-09 14:37:43 $
+ *  last change: $Author: npower $ $Date: 2003-10-15 08:29:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,9 +78,8 @@ public class ScriptBrowseNode extends PropertySet implements XBrowseNode {
     public boolean deletable = false;
 
     public ScriptBrowseNode(ScriptEntry entry, String location) {
-        uri = "script://" + entry.getLogicalName() +
-            "?function=" + entry.getLanguageName() +
-            "&language=" + entry.getLanguage() +
+        uri = "script://" + entry.getFunctionName() +
+            "?" + "language=" + entry.getLanguage() +
             "&location=" + location;
 
         System.out.println("Creating ScriptBrowseNode: " + uri);

scripting/source/storage/ScriptMetadataImporter.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScriptMetadataImporter.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dfoster $ $Date: 2003-07-23 10:19:55 $
+ *  last change: $Author: npower $ $Date: 2003-10-15 08:29:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -391,6 +391,9 @@ void ScriptMetadataImporter::endElement( const ::rtl::OUString & aName )
         case PARCEL:
             break;
         case SCRIPT:
+        // np adjust logicalName to be equal to function name
+        // as logical name concept has been removed
+        m_ScriptData.logicalname = m_ScriptData.functionname;
             mpv_ScriptDatas->push_back( m_ScriptData );
             m_ScriptData =  ScriptData();
             break;

scripting/source/storage/ScriptStorage.cxx

@@ -2,8 +2,8 @@
 *
 *  $RCSfile: ScriptStorage.cxx,v $
 *
-*  $Revision: 1.28 $
-*  last change: $Author: npower $ $Date: 2003-08-19 09:49:50 $
+*  $Revision: 1.29 $
+*  last change: $Author: npower $ $Date: 2003-10-15 08:29:37 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -769,7 +769,15 @@ throw ( lang::IllegalArgumentException,
         RuntimeException )
 {
     ::osl::Guard< osl::Mutex > aGuard( m_mutex );
-
+// format is script:://[function_name]?language=[languge]&location=[location]
+// LogicalName is now not used anymore, further more the ScriptURI class
+// will be retired also and a new UNO service will be used. Additionally the
+// parcel-description will also need to be modified to remove logical name
+// ScriprtMetaDataImporter has been modified to ignore the Logical name
+// definined in the parcel-desc.xml. As an interim temp solution the  Datas_vec
+// structure that is returned from ScriptMetDataImporter sets the logicalname
+// to the function name. ScriptURI class has been changed in the same way.
+//
     Sequence< Reference< storage::XScriptInfo > > results;
     ScriptURI scriptURI( queryURI );
     OSL_TRACE( "getting impl for language %s, function name: %s",
@@ -798,7 +806,7 @@ throw ( lang::IllegalArgumentException,
 
     //find the implementations for the given language
     ScriptFunction_hash::const_iterator it_datas = h_it->second.find(
-        scriptURI.getFunctionName() );
+        scriptURI.getLogicalName() );
     ScriptFunction_hash::const_iterator it_datas_end = h_it->second.end();
 
     if ( it_datas == it_datas_end )