Changeset 7130

Timestamp:

2004-03-29T11:49:22+12:00 (20 years ago)

Author:

kjdon

Message:

when generating the homeextra macro need to make sure we get language specific values for collectionname, iconcollection and iconcollectionsmall

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -214 +214 @@
           text_tset metadata;
           metadata.insert ("collectionname");
+          text_t lang = args["l"];
+          if (!lang.empty()) {
+        metadata.insert ("collectionname:"+lang);
+          }
           text_t collectionname = *collist_here;
           
           if (get_info ("collection", *collist_here, metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
-         if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
-            collectionname = response.docInfo[0].metadata["collectionname"].values[0];
+        if (!lang.empty() && !response.docInfo[0].metadata["collectionname:"+lang].values[0].empty()) {
+          collectionname = response.docInfo[0].metadata["collectionname:"+lang].values[0]; 
+        } else if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
+          collectionname = response.docInfo[0].metadata["collectionname"].values[0];
+        }
           }
           
@@ -271 +278 @@
   text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
   bool found_valid_col = false;
-
   recptprotolistclass::iterator rprotolist_here = protos->begin();
   recptprotolistclass::iterator rprotolist_end = protos->end();
@@ -333 +339 @@
           metadata.insert ("iconcollection");
           metadata.insert ("iconcollectionsmall");
+          // also look for lang specific values
+          text_t lang = args["l"];
+          if (!lang.empty()) {
+        metadata.insert ("collectionname:"+lang);
+        metadata.insert ("iconcollection:"+lang);
+        metadata.insert ("iconcollectionsmall:"+lang);
+          }
           text_t collectionname = *collist_here;
           text_t alt = collectionname;
@@ -338 +351 @@
           if (get_info ("collection", *collist_here, metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
-        if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
+        // get the "collectionname"
+        if (!lang.empty() && !response.docInfo[0].metadata["collectionname:"+lang].values[0].empty()) {
+          alt = response.docInfo[0].metadata["collectionname:"+lang].values[0]; 
+        } else if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
           alt = response.docInfo[0].metadata["collectionname"].values[0];
+        }
         
         text_t iconurl;
         iconurl.clear();
 
-        if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) {
+        if (!lang.empty() &&!response.docInfo[0].metadata["iconcollectionsmall:"+lang].values[0].empty()) {
+         iconurl = response.docInfo[0].metadata["iconcollectionsmall:"+lang].values[0]; 
+        } else if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) {
           iconurl = response.docInfo[0].metadata["iconcollectionsmall"].values[0];
+        } else if (!lang.empty() && !response.docInfo[0].metadata["iconcollection:"+lang].values[0].empty()) {
+          iconurl = response.docInfo[0].metadata["iconcollection:"+lang].values[0];
         } else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty()) {
           iconurl = response.docInfo[0].metadata["iconcollection"].values[0];
         }
-
+        
         if (!iconurl.empty())
           {