Changeset 17783 for gsdl/trunk/common-src/src/gdbmedit/txt2db/txt2db.cpp

Timestamp:

2008-11-07T13:41:18+13:00 (15 years ago)

Author:

ak19

Message:

1. When a collection's txt.gz version of its database produced on a Windows machine is brought over to a Linux machine, the library server used to break when trying to serve the collection, because the txt2db program would preserve the Windows-specific carriage-return character. Now this is discarded to make the database file generated from the txt.gz db files uniform between operating systems. 2. (Minor changes, defensive programming.) Dr Bainbridge corrected all newlines chars printed out to stderr and stdout to endl as this may produce more consistent results across operating systems.

File:

• gsdl/trunk/common-src/src/gdbmedit/txt2db/txt2db.cpp (modified) (7 diffs)

gsdl/trunk/common-src/src/gdbmedit/txt2db/txt2db.cpp

@@ -49 +49 @@
 
 void print_usage (char *program_name) {
-  cerr << "usage: " << program_name << " [options] database-name\n\n";
-  cerr << "options:\n";
-  cerr << " -append        append to existing database\n\n";
+  cerr << "usage: " << program_name << " [options] database-name" << endl << endl;
+  cerr << "options:" << endl;
+  cerr << " -append        append to existing database" << endl << endl;
 }
 
@@ -77 +77 @@
       dbname = argv[2];
     } else {
-      cerr << argv[1] << " is not a valid option.\n\n";
+      cerr << argv[1] << " is not a valid option." << endl << endl;
       print_usage (argv[0]);
       exit (0);
@@ -95 +95 @@
 #endif
   if (dbf == NULL) {
-    cerr << "couldn't create " << dbname << "\n";
+    cerr << "couldn't create " << dbname << endl;
     exit (0);
   }
@@ -113 +113 @@
     }
     if (!cin.eof()) cin.get(c); // skip ]
-    while (!cin.eof() && (c == '\n' || c == 'r')) cin.get(c);
+    while (!cin.eof() && (c == '\n' || c == '\r')) cin.get(c);
     
     // look for 70 dashes
     tmp = "";
     while (!cin.eof() && (num_dashes < 70)) {
-      if (c == '\n' || c == '\r') {
+      if (c == '\n') {
     tmp.push_back ((unsigned char)c);
+    num_dashes = 0; 
+    
+      } else if (c == '\r') { 
+    // Here we are able to process both Windows-specific text files 
+    // (containing carriage-return, newline) and Linux text files 
+    // (containing only newline characters) by ignoring the Windows' 
+    // carriage-return altogether so that we produce a uniform database
+    // file from either system's type of text file. 
+    // If we don't ignore the carriage return here, txt.gz files
+    // produced on Windows cause a GS library running on Linux to break.
     num_dashes = 0;
-    
+
       } else if (c == '-') {
     tmp.push_back ((unsigned char)c);
@@ -141 +151 @@
       key_data.dptr = key.getcstr();
       if (key_data.dptr == NULL) {
-    cerr << "NULL key_data.dptr\n";
+    cerr << "NULL key_data.dptr" << endl;
     exit (0);
       }
@@ -150 +160 @@
       value_data.dptr = value.getcstr();
       if (value_data.dptr == NULL) {
-    cerr << "NULL value_data.dptr\n";
+    cerr << "NULL value_data.dptr" << endl;
     exit (0);
       }
@@ -157 +167 @@
       // store the value
       if (gdbm_store (dbf, key_data, value_data, GDBM_REPLACE) < 0) {
-    cerr << "gdbm_store returned an error\n";
+    cerr << "gdbm_store returned an error" << endl;
     exit (0);
       }