Changeset 9931 for trunk/gsdl/src/recpt/statusaction.cpp

Timestamp:

2005-05-23T16:36:40+12:00 (19 years ago)

Author:

kjdon

Message:

getting collectionmeta from teh colinforesponse now, not using a get_info via the protocol. this means that collmeta will be read from the config file not from the database - it will not require rebuilding for changes to take effect.

File:

• trunk/gsdl/src/recpt/statusaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/statusaction.cpp

@@ -52 +52 @@
 }
 
-void statusaction::output_welcome (cgiargsclass &/*args*/, recptprotolistclass *protos, 
+void statusaction::output_welcome (cgiargsclass &args, recptprotolistclass *protos, 
                    displayclass &disp, outconvertclass &outconvert, 
                    ostream &textout, ostream &logout) {
@@ -90 +90 @@
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       if (cinfo != NULL) {
-        text_t collname = *collist_here;
-        text_tmap::iterator it = cinfo->collectionmeta.find("collectionname");
-        if (it != cinfo->collectionmeta.end()) collname = (*it).second;
+        text_t collname = cinfo->get_collectionmeta("collectionname", args["l"]);
+        if (collname.empty()) {
+          collname = *collist_here;
+        }
 
         textout << "<td>";
@@ -594 +595 @@
 
       textout << "<tr><th valign=top>collection metadata</th><td><table>\n";
-      text_tmap::iterator meta_here = collectinfo->collectionmeta.begin();
-      text_tmap::iterator meta_end = collectinfo->collectionmeta.end();
+      collectionmeta_map::iterator meta_here = collectinfo->collectionmeta.begin();
+      collectionmeta_map::iterator meta_end = collectinfo->collectionmeta.end();
+      
       while (meta_here != meta_end) {
-    textout << outconvert << "<tr><td>" << (*meta_here).first
-        << "</td><td>" << (*meta_here).second << "</td></tr>\n";
+    textout << outconvert << "<tr><td valign=top>" << (*meta_here).first
+        << "</td><td><table>" ;
+        text_tmap lang_map = (*meta_here).second;
+    text_tmap::iterator lang_here = lang_map.begin();
+    text_tmap::iterator lang_end = lang_map.end();
+    while (lang_here != lang_end) {
+      textout << outconvert << "<tr><td>" << (*lang_here).first
+            << "</td><td>" << (*lang_here).second << "</td></tr>\n";
+      
+      ++lang_here;
+    }
+    textout << outconvert << "</table></td></tr>\n";
     ++meta_here;
       }
@@ -607 +619 @@
       text_tmap::iterator format_end = collectinfo->format.end();
       while (format_here != format_end) {
-    textout << outconvert << "<tr><td>" << (*format_here).first
+    textout << outconvert << "<tr><td valign=top>" << (*format_here).first
         << "</td><td>" << html_safe((*format_here).second) << "</td></tr>\n";
     ++format_here;