Bug #8, Fixes for csv-import commandline PHP script [iet:10328304]

IET-OU · Apr 13, 2018 · 963b5ae · 963b5ae
1 parent df85371
commit 963b5ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/bin/csv-import.php b/bin/csv-import.php
@@ -45,7 +45,9 @@
 if ($argc > 1) {
     $csvfile = CSV_DIR . '/' . clean_param($argv[ $argc - 1 ], PARAM_PATH);
 } else {
-    $csvfile = CSV_DIR . CSV_FILENAME;
+  cli_writeln('Error. Missing CSV file.');
+  exit( 1 );
+  // Was: $csvfile = CSV_DIR . CSV_FILENAME;
 }
 
 $lineCount = OuUser::countFileLines($csvfile);

diff --git a/db/User.php b/db/User.php
@@ -148,13 +148,20 @@ public static function insertFromCsv($filename = '../example.csv', $ignore_headi
     }
 
     /** Return the number of new-lines in a text file (including CSV files).
+     * @param string $filename (Was default: '../example.csv')
      * @return int Line count.
      * @link https://stackoverflow.com/questions/2162497/efficiently-counting-the-number-of-lines-of-a-text-file-200mb
      */
-    public static function countFileLines($filename = '../example.csv')
+    public static function countFileLines($filename = null)
     {
         $linecount = 0;
         $handle = fopen($filename, 'r');
+
+        if (! $handle) {
+            echo "Error, missing file: $filename\n";
+            exit(1);
+        }
+
         while (! feof($handle)) {
             $line = fgets($handle);
             $linecount++;
@@ -314,7 +321,9 @@ public static function getRedirectUrl($profile, $action = null)
         if (! isset($profile->teslainstrument)) {
             self::debug([ __FUNCTION__, 'Undefined instrument', $profile ]);
         }
-        if (! $redirects) { return null; }
+        if (! $redirects) {
+            return null;
+        }
 
         $url = $redirects[ $instrument ]->url;