Changeset 19611 for gsdl/trunk/runtime-src

Timestamp:

2009-05-27T11:45:40+12:00 (15 years ago)

Author:

kjdon

Message:

changed path composition to use filename_cat instead of append, and changed location of z3950 config files to etc/packages/z3950

Location:

gsdl/trunk/runtime-src/src

Files:

• recpt/librarymain.cpp (modified) (2 diffs)
• z3950/z3950_to_gsdl.cpp (modified) (4 diffs)

gsdl/trunk/runtime-src/src/recpt/librarymain.cpp

@@ -98 +98 @@
 #if defined(USE_Z3950)
   // add the z39.50 server information. Read in the file
-  // etc/recpt/z3950.cfg for list of servers and their databases.
-  text_t z3950cfg = filename_cat (gsdlhome, "etc");
-  z3950cfg = filename_cat (z3950cfg, "packages");
-  z3950cfg = filename_cat (z3950cfg, "z3950.cfg");
+  // etc/packages/z3950/z3950.cfg for list of servers and their databases.
+  text_t z3950cfg = filename_cat (gsdlhome, "etc", "packages", "z3950", "z3950.cfg");
 #ifdef USE_FASTCGI
   // currently can't use z39.50 if fastcgi used
@@ -109 +107 @@
   if (file_exists(z3950cfg)) {
 #endif
-    text_t z3950err = filename_cat (gsdlhome, "etc", "z3950log.txt");
+    text_t z3950err = filename_cat (gsdlhome, "etc", "packages", "z3950", "z3950log.txt");
     zproto.read_config_file(z3950cfg,z3950err);
     // only add this protocol if we have any servers configured.

gsdl/trunk/runtime-src/src/z3950/z3950_to_gsdl.cpp

@@ -212 +212 @@
     // read in the cfg file for Bib1_to_DCES
     text_t col_filename = gsdlhome;
-    col_filename.appendcstr("/collect/");
-    col_filename.append(collectionName);
-    col_filename.appendcstr("/etc/bib1_to_dces.cfg");
+    col_filename = filename_cat(gsdlhome, "collect", collectionName, "etc", "bib1-mapping.txt"); 
 
     if (!bib1_to_dc_mapping(col_filename)) {
-      text_t site_filename = gsdlhome;
-      site_filename.appendcstr("/etc/bib1_to_dces.cfg");
+      text_t site_filename = filename_cat(gsdlhome, "etc", "packages", "z3950", "bib1-mapping.txt");
 
       if (!bib1_to_dc_mapping(site_filename)) {
-    cerr << "Unable to find bib1->dublin core mapping for " 
+    cerr << "Unable to find bib1 attribute mapping for " 
          << collectionName << endl;
     cerr << "Looked for:\n  " << col_filename << "\n  " 
@@ -231 +228 @@
 
     // read in the cfg file for mapping Dublin Core to Short (internal name)
-    text_t build_filename = gsdlhome;
-    build_filename.appendcstr("/collect/");
-    build_filename.append(collectionName);
-    build_filename.appendcstr("/index/build.cfg");
+    text_t build_filename = filename_cat(gsdlhome, "collect", collectionName, "index", "build.cfg");
 
     if (!dc_to_short_mapping(build_filename,collectionName)) {
@@ -274 +268 @@
     this->gsdlhome = home;
     //cerr << gsdlhome.getcstr() << endl;
-    dirname = filename_cat(gsdlhome, "/collect");
+    dirname = filename_cat(gsdlhome, "collect");
     cdirname = dirname.getcstr();
     if (!read_dir (cdirname, collections)) { 
@@ -295 +289 @@
       comerror_t    error = noError;
 
-      this->openLogfile("/etc/z3950out.txt", logout);
+      // openLogfile does a filename_cat with this path, changing 
+      // the / appropriately.
+      this->openLogfile("/etc/packages/z3950/z3950out.txt", logout);
       reply = protocol->init(error, logout);
       logout.close();