Changeset 10981

Timestamp:

2005-12-09T10:58:21+13:00 (18 years ago)

Author:

kjdon

Message:

datelist can now take a comma separated list of metadata names, eg. pub.Date,Date, or Date,Year. So we need to modify handling of the dm arg.

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (1 diff)
• datelistbrowserclass.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -534 +534 @@
 
   if (classifytype == "DateList") {
-    metadata.insert(args["dm"]);
+    text_t datelist = args["dm"];
+    text_tarray dates;
+    splitchar(datelist.begin(), datelist.end(), ',', dates);
+    text_tarray::iterator begin = dates.begin();
+    text_tarray::iterator end = dates.end();
+    while (begin!= end) {
+      metadata.insert(*begin);
+      begin++;
+    }
+      //metadata.insert(args["dm"]);
   }
 

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -96 +96 @@
     date_meta = "Date";
   }
+  text_tarray dates;
+  splitchar(date_meta.begin(), date_meta.end(), ',', dates);
+
   while (thissection != endsection) {
 
     text_t &doctype = (*thissection).metadata["doctype"].values[0];
-    text_t &date = (*thissection).metadata[date_meta].values[0]; 
+
+    text_tarray::iterator begin = dates.begin();
+    text_tarray::iterator end = dates.end();
+    text_t date;
+    while (begin!= end && date.empty()) {
+      date = (*thissection).metadata[*begin].values[0];
+      begin++;
+    }
+    //text_t &date = (*thissection).metadata[date_meta].values[0]; 
 
     // bail on this document if it has no date