Changeset 12697

Timestamp:

2006-09-07T11:03:38+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed IsisGdl to ignore logically deleted records, unless the new "-include_logically_deleted_records" argument is given.

File:

• trunk/gsdl/packages/isis-gdl/IsisGdl.cpp (modified) (3 diffs)

trunk/gsdl/packages/isis-gdl/IsisGdl.cpp

@@ -54 +54 @@
 {
 
-    if (argc < 2)
+    if (argc < 2 || argc > 3)
     {
-        std::cout << "usage: IsisGdl master_file_full_name" << std::endl;
+        std::cout << "usage: IsisGdl [-include_logically_deleted_records] master_file_full_name" << std::endl;
         return 1;
     }
@@ -66 +66 @@
         // and should be the master file name with extension ".mst"
         // "C:\IsisGdl\cds.mst" for ex
-        db.OpenDb(argv[1]);
+        db.OpenDb(argv[argc - 1]);
     }
     catch(CIsisDbException e)
     {
         std::string msg = "Cannot open isis db: ";
-        msg += argv[1];
+        msg += argv[argc - 1];
         msg += isisExceptionMessage((IsisError) e.m_iError);
         std::cerr<< msg << std::endl;
@@ -94 +94 @@
         int status = db.ReadDbRecord(i, mfr);
 
-        if (status == Active || status == LogicalyDeleted)
+        if (status == Active || (strcmp(argv[1], "-include_logically_deleted_records") == 0 && status == LogicalyDeleted))
         {
             // If the record is physically on the master file