Changeset 14035 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

Timestamp:

2007-05-02T13:40:35+12:00 (17 years ago)

Author:

shaoqun

Message:

make it restrive mulitple metadata values

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -176 +176 @@
     } else {
         for (int i=0; i<metadata_names.size(); i++) {
-        String meta_name = (String) metadata_names.get(i);
+                String meta_name = (String) metadata_names.get(i);
         String value = getMetadata(node_id, info, meta_name, lang);
         GSXML.addMetadata(this.doc, metadata_list, meta_name, value);
@@ -301 +301 @@
     int pos = metadata.indexOf(GSConstants.META_RELATION_SEP);
     if (pos ==-1) {
-        // just a plain meta entry eg dc.Title
-        return macro_resolver.resolve((String)info.getInfo(metadata), lang, MacroResolver.SCOPE_META, node_id);
-    }
-    
+              Vector values = info.getMultiInfo(metadata);        
+                   
+        // just a plain meta entry eg dc.Title
+         StringBuffer result = new StringBuffer(); 
+         boolean first = true;
+         for (int i=0; i<values.size(); i++) {
+         if (first) {
+             first = false;
+         } else {
+             result.append(separator);
+         }
+         result.append(this.macro_resolver.resolve((String)values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id)); 
+         }
+         return result.toString();
+    }
+
     String temp = metadata.substring(0, pos);
     metadata = metadata.substring(pos+1);
@@ -366 +378 @@
         // we have multiple meta
         Vector values = relation_info.getMultiInfo(metadata);
-        if (values != null) {
+        if (values != null) {
         boolean first = true;
         for (int i=0; i<values.size(); i++) {
@@ -377 +389 @@
         }
         }
+          logger.info(result); 
     }
     // if not ancestors, then this is all we do