Changeset 11157

Timestamp:

2008-09-02 13:34:04 (3 months ago)

Author:

olly

Message:

Backport change from trunk:
examples/copydatabase.cc: Use C++ forms of C headers. Only treat
'\' as a directory separator on platforms where it is. Update
counter every 13 counting up to the end so that the digits all
"rotate" and the counter ends up on the exact total.

Location:

branches/1.0/xapian-core

Files:

• ChangeLog (modified) (1 diff)
• examples/copydatabase.cc (modified) (6 diffs)

branches/1.0/xapian-core/ChangeLog

@@ +1 @@
+Tue Sep 02 12:33:51 GMT 2008  Olly Betts <olly@survex.com>
+
+        * Backport change from trunk:
+        * examples/copydatabase.cc: Use C++ forms of C headers.  Only treat
+          '\' as a directory separator on platforms where it is.  Update
+          counter every 13 counting up to the end so that the digits all
+          "rotate" and the counter ends up on the exact total.
+
 Tue Sep 02 12:06:26 GMT 2008  Olly Betts <olly@survex.com>
 

branches/1.0/xapian-core/examples/copydatabase.cc

@@ -2 +2 @@
  * @brief Perform a document-by-document copy of one or more Xapian databases.
  */
-/* Copyright (C) 2006,2007 Olly Betts
+/* Copyright (C) 2006,2007,2008 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
 #include <iostream>
 
-#include <math.h> // For log10().
-#include <stdlib.h> // For exit().
-#include <string.h> // For strcmp() and strrchr().
+#include <cmath> // For log10().
+#include <cstdlib> // For exit().
+#include <cstring> // For strcmp() and strrchr().
 
 using namespace std;
@@ -82 +82 @@
         // Find the leaf-name of the database path for reporting progress.
         const char * leaf = strrchr(src, '/');
+#if defined __WIN32__ || defined __EMX__
         if (!leaf) leaf = strrchr(src, '\\');
+#endif
         if (leaf) ++leaf; else leaf = src;
 
@@ -98 +100 @@
                 db_out.add_document(db_in.get_document(*it));
 
+                // Update for the first 10, and then every 13th document
+                // counting back from the end (this means that all the
+                // digits "rotate" and the counter ends up on the exact
+                // total.
                 ++c;
-                // Update for the first 10, and then every 10th document.
-                if (c <= 10 || c % 10 == 0) {
+                if (c <= 10 || (dbsize - c) % 13 == 0) {
                     cout << '\r' << leaf << ": ";
                     cout << setw(width) << c << '/' << dbsize << flush;
@@ -117 +122 @@
             ++spellword;
         }
-        cout << " Done." << endl;
+        cout << " done." << endl;
 
         cout << "Copying synonym data..." << flush;
@@ -130 +135 @@
             ++synkey;
         }
-        cout << " Done." << endl;
+        cout << " done." << endl;
     }