Changeset 4738

Timestamp:

2003-06-20T11:04:31+12:00 (21 years ago)

Author:

sjboddie

Message:

The first entry in the "indexes" field of a collect.cfg file will now be
used as the default if no "defaultindex" field is specified. Likewise
for defaultsubcollection and defaultlanguage fields.

Location:

trunk/gsdl/src

Files:

• colservr/mggdbmsource.cpp (modified) (1 diff)
• colservr/queryfilter.cpp (modified) (2 diffs)
• recpt/win32.mak (modified) (1 diff)

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -75 +75 @@
 
   if (!sourceclass::init (logout)) return false;
+
+  if (defaultindex.empty()) {
+    // use first index in map as default if no default is set explicitly
+    text_tarray fromarray;
+    indexmap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      defaultindex = fromarray[0];
+    }
+  }
+
+  if (defaultsubcollection.empty()) {
+    // use first subcollection in map as default if no default is set explicitly
+    text_tarray fromarray;
+    subcollectionmap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      defaultsubcollection = fromarray[0];
+    }
+  }
+
+  if (defaultlanguage.empty()) {
+    // use first language in map as default if no default is set explicitly
+    text_tarray fromarray;
+    languagemap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      defaultlanguage = fromarray[0];
+    }
+  }
   
   // get the collection directory name

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -329 +329 @@
     filterOptions["Language"].validValues = options;
 
-  } else if (key == "defaultlanguage") 
+  } else if (key == "defaultlanguage") {
     languagemap.from2to (cfgline[0], filterOptions["Language"].defaultValue);
+  }
 }
 
@@ -337 +338 @@
 
   if (!filterclass::init(logout)) return false;
+
+  if (filterOptions["Index"].defaultValue.empty()) {
+    // use first index in map as default if no default is set explicitly
+    text_tarray fromarray;
+    indexmap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      filterOptions["Index"].defaultValue = fromarray[0];
+    }
+  }
+
+  if (filterOptions["Subcollection"].defaultValue.empty()) {
+    // use first subcollection in map as default if no default is set explicitly
+    text_tarray fromarray;
+    subcollectionmap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      filterOptions["Subcollection"].defaultValue = fromarray[0];
+    }
+  }
+
+  if (filterOptions["Language"].defaultValue.empty()) {
+    // use first language in map as default if no default is set explicitly
+    text_tarray fromarray;
+    languagemap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      filterOptions["Language"].defaultValue = fromarray[0];
+    }
+  }
 
   // get the filename for the database and make sure it exists

trunk/gsdl/src/recpt/win32.mak

@@ -146 +146 @@
          $(LINK) $(OBJECTS) $(LIBS) 
 
-# we want statusaction to always be compiled in case the status of
+# we want the following to always be compiled in case the status of
 # GSDL_LOCAL_LIBRARY has changed
 statusaction.obj: FORCE
+configaction.obj: FORCE
 
 FORCE: