Changeset 1860 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2001-01-26T07:26:45+13:00 (23 years ago)

Author:

cs025

Message:

Included CORBA branch for first time

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -890 +890 @@
     if (!a->do_action (args, &protocols, &browsers, disp, (*outconverter), contentout, logout))
       return false;
-
   } else {
     // the action was not found!!
@@ -1138 +1137 @@
   bool first = true;
 
+  cout << "Action is " << a->get_action_name() << endl;
+
   text_tmap::iterator params_here = configinfo.pageparams.begin();
   text_tmap::iterator params_end = configinfo.pageparams.end();
@@ -1156 +1157 @@
   disp.openpage(pageparams, configinfo.macroprecedence);
 
-
   // define external macros for each action
   actionptrmap::iterator actionhere = actions.begin ();
@@ -1163 +1163 @@
   while (actionhere != actionend) {
     assert ((*actionhere).second.a != NULL);
-    if ((*actionhere).second.a != NULL) 
+    if ((*actionhere).second.a != NULL) {
       (*actionhere).second.a->define_external_macros (disp, args, &protocols, logout);
+    }
     actionhere++;
   }
@@ -1185 +1186 @@
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
   disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
+
+  if (!collection.empty()) {
+    // DB // ****
+    ColInfoResponse_t cinfo;
+    comerror_t err;
+    recptproto *collectproto = protocols.getrecptproto (collection, logout);
+    if (collectproto != NULL) {
+      collectproto->get_collectinfo (collection, cinfo, err, logout);
+      text_t httpcollection 
+    = "http://" + cinfo.httpdomain + cinfo.httpprefix 
+        +"/collect/" + collection; 
+      
+      disp.setmacro ("httpcollection", "Global", httpcollection); 
+    }
+  }
+
   text_t compressedoptions = get_compressed_arg(args, logout);
   disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
@@ -1255 +1272 @@
     }
       }
+
+      text_t iconcollection;
+      disp.expandstring ("Global", "_iconcollection_", iconcollection);
+      if (!iconcollection.empty())
+    {
+      if (iconcollection[0]=='/')
+        {
+          // local but with full path
+          ColInfoResponse_t cinfo;
+          comerror_t err;
+          collectproto->get_collectinfo (collection, cinfo, err, logout);
+          iconcollection = "http://" + cinfo.httpdomain + iconcollection;
+          disp.setmacro("iconcollection","Global",iconcollection);
+        }
+    }
     }
   }
@@ -1304 +1336 @@
   }
 }
+
+