Changeset 825 for trunk

Timestamp:

1999-12-13T15:45:16+13:00 (24 years ago)

Author:

davidb

Message:

Support for more than one metavalue for the same metadata name

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.15  1999/12/13 02:45:16  davidb
+   Support for more than one metavalue for the same metadata name
+
    Revision 1.14  1999/10/30 22:23:11  sjboddie
    moved table functions from browsetools
@@ -484 +487 @@
   switch (meta.parentcommand) {
   case pNone:
-    if (meta.metaname == "Date")
-      return format_date (docinfo.metadata[meta.metaname].values[0]);
-    if (meta.metacommand == mCgiSafe) 
-      return cgi_safe (docinfo.metadata[meta.metaname].values[0]);
-    else return docinfo.metadata[meta.metaname].values[0];
+    {
+      text_t classifier_metaname = docinfo.classifier_metadata_type;
+       int metaname_index 
+    = (classifier_metaname == meta.metaname) ? docinfo.classifier_metadata_offset : 0;
+      text_t metadata_item = docinfo.metadata[meta.metaname].values[metaname_index];
+      
+      if (meta.metaname == "Date")
+    return format_date (metadata_item);
+      if (meta.metacommand == mCgiSafe) 
+    return cgi_safe (metadata_item);
+      else return metadata_item;
+    }
 
   case pImmediate: