Index: trunk/BNC/bncmain.cpp
===================================================================
--- trunk/BNC/bncmain.cpp	(revision 1551)
+++ trunk/BNC/bncmain.cpp	(revision 1552)
@@ -61,8 +61,5 @@
 
   bool       GUIenabled  = true;
-  bool       fileInput   = false;
-  bool       confFile  = false;
-  bool       dragAndDrop = true;
-  QByteArray fileName;
+  QByteArray rawFileName;
   QByteArray format; 
   QString    dateString;
@@ -73,64 +70,30 @@
     if (QByteArray(argv[ii]) == "-nw") {
       GUIenabled = false;
-      dragAndDrop = false;
-      break;
     }
-  }
-
-  for (int ii = 1; ii < argc; ii++) {
-    if (QByteArray(argv[ii]) == "-file" || QByteArray(argv[ii]) == "--file") {
-      GUIenabled = false;
-      fileInput  = true;
-      dragAndDrop = false;
-      if (ii+1 < argc) {
-        fileName = QByteArray(argv[ii+1]);
+    if (ii + 1 < argc) {
+      if (QByteArray(argv[ii]).indexOf("-conf")   != -1) {
+        confFileName = QString(argv[ii+1]);
       }
-    }
-    if (QByteArray(argv[ii]) == "-format" || QByteArray(argv[ii]) == "--format") {
-      GUIenabled = false;
-      fileInput  = true;
-      dragAndDrop = false;
-      if (ii+1 < argc) {
+      if (QByteArray(argv[ii]).indexOf("-file")   != -1) {
+        GUIenabled = false;
+        rawFileName   = QByteArray(argv[ii+1]);
+      }
+      if (QByteArray(argv[ii]).indexOf("-format") != -1) {
         format = QByteArray(argv[ii+1]);
       }
-    }
-    if (QByteArray(argv[ii]) == "-date" || QByteArray(argv[ii]) == "--date") {
-      dragAndDrop = false;
-      if (ii+1 < argc) {
+      if (QByteArray(argv[ii]).indexOf("-date")   != -1) {
         dateString = QString(argv[ii+1]);
       }
-    }
-    if (QByteArray(argv[ii]) == "-time" || QByteArray(argv[ii]) == "--time") {
-      dragAndDrop = false;
-      if (ii+1 < argc) {
+      if (QByteArray(argv[ii]).indexOf("-time")   != -1) {
         timeString = QString(argv[ii+1]);
-      }
-    }
-    if (QByteArray(argv[ii]) == "-conf" || QByteArray(argv[ii]) == "--conf") {
-      confFile  = true;
-      dragAndDrop = false;
-      if (ii+1 < argc) {
-        confFileName = QString(argv[ii+1]);
-      }
-    }
-    if (dragAndDrop && ii == 1) {
-      confFile  = true;
-      if (ii < argc) {
-        confFileName = QString(argv[ii]);
       }
     }
   }
 
-  QString printHelp;
-  printHelp = "Usage: bnc -nw\n" 
-              "           --conf <confFileName>\n" 
-              "           --file <inputFileName>\n"
-              "           --format <RTIGS | RTCM_2 | RTCM_3>\n"
-              "           --date YYYY-MM-DD  --time HH:MM:SS";
-
-  if (confFile && confFileName.isEmpty() ) {
-      cout << printHelp.toAscii().data() << endl;
-      exit(0);
-  }
+  QString printHelp = "Usage: bnc -nw\n" 
+                      "           --conf <confFileName>\n" 
+                      "           --file <rawFileName>\n"
+                      "           --format <RTIGS | RTCM_2 | RTCM_3>\n"
+                      "           --date YYYY-MM-DD  --time HH:MM:SS";
 
   bncApp app(argc, argv, GUIenabled);
@@ -180,8 +143,8 @@
     // Normal case - data from Internet
     // --------------------------------
-    if (!fileInput) {
+    if ( rawFileName.isEmpty() ) {
       caster->slotReadMountPoints();
       if (caster->numStations() == 0) {
-      return 0;
+        exit(0);
       }
     }
@@ -190,7 +153,6 @@
     // -----------------------------
     else {
-      if ( fileName.isEmpty() || format.isEmpty() || 
-           dateString.isEmpty() || timeString.isEmpty() ) {
-      cout << printHelp.toAscii().data() << endl;
+      if ( format.isEmpty() || dateString.isEmpty() || timeString.isEmpty() ) {
+        cout << printHelp.toAscii().data() << endl;
         exit(0);
       }
@@ -200,5 +162,5 @@
                       QTime::fromString(timeString, Qt::ISODate), Qt::UTC);
 
-      bncGetThread* getThread = new bncGetThread(fileName, format);
+      bncGetThread* getThread = new bncGetThread(rawFileName, format);
       caster->addGetThread(getThread);
     }