Changeset 4503

Timestamp:

2003-06-06T15:42:53+12:00 (21 years ago)

Author:

kjdon

Message:

getFullName and getFullIdentifier now take a namespace string as a parameter to be used if the element has no parent - and therefore can obtain its namespace

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -408 +408 @@
      * @return A fully qualified identifier as a <strong>String</strong>
      */
-    static final public String getFullIdentifier(Node element) {
+    static final public String getFullIdentifier(Node element, String namespace) {
     if(element == null) {
         return "Error";
@@ -421 +421 @@
         }
         return identifier + NS_SEP + getIdentifier(element);
-    }
-    return getIdentifier(element); // No namespace anymore
+    } 
+    if (namespace.equals("")) {
+        return getIdentifier(element); // No namespace anymore
+    } 
+    return namespace + NS_SEP + getIdentifier(element);
     } // static public String getFullIdentier(Node element)
 
     /*************************************************************************/
-    /** Method to construct an elements fully qualified name. Note that this is different from a nodes identifier. Think of name as a short, unique reference to an metadata element, whereas identifier can be much longer, language specific and non-unique.
+    /** Method to construct an elements fully qualified name. Note that this is different from a nodes identifier. Think of name as a short, unique reference to a metadata element, whereas identifier can be much longer, language specific and non-unique.
      * @param element An <strong>Element</strong> whose name we are interested in.
      * @return A <strong>String</strong> representing this given elements fully namespace qualified name.
      */
     static final public String getFullName(Element element) {
+    return getFullName(element, "");
+
+    }
+    /*************************************************************************/
+    /** Method to construct an elements fully qualified name. Note that this is different from a nodes identifier. Think of name as a short, unique reference to a metadata element, whereas identifier can be much longer, language specific and non-unique.
+     * @param element An <strong>Element</strong> whose name we are interested in.
+     * @return A <strong>String</strong> representing this given elements fully namespace qualified name.
+     */
+    static final public String getFullName(Element element, String def_namespace) {
     if(element == null) {
         return null;
@@ -436 +448 @@
     // Get namespace for given element.
     Element root = (Element)element.getParentNode();
-    String identifier = root.getAttribute("namespace") + NS_SEP + element.getAttribute("name");
+    String namespace = "";
+    if (root==null) {
+        namespace = def_namespace;
+    }  else {
+        namespace = root.getAttribute("namespace") ;
+    }
+    String identifier = namespace + NS_SEP + element.getAttribute("name");
     // Get name and return it.
     if(identifier.startsWith(".")) {
@@ -557 +575 @@
     static final public String[] getStructuralDetails(MetadataSet mds, Element element) {
     String details[] = new String[4];
-    Element root = (Element)element.getParentNode();
+    //Element root = (Element)element.getParentNode();
     //details[0] = root.getAttribute("name");
     //details[1] = root.getAttribute("namespace");
@@ -671 +689 @@
     }
 
+    /** can only be used to set the english value */
     static final public void setIdentifier(Node element, String value) {
     // Get the 'identifier' Element
@@ -677 +696 @@
         if(node.getNodeName().equals("Attribute")) {
         Element target = (Element)node;
-        if(target.getAttribute("name").equals("identifier")) {
+        if(target.getAttribute("name").equals("identifier") && target.getAttribute("language").equals("en")) {
             Node text = target.getFirstChild();
             text.setNodeValue(value);
+            break;
         }
         }