From 510d3a618adafec66affbce5d3447617babc79ba Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 31 Jan 2007 11:22:15 +0000
Subject: [PATCH] Fixed bug #2146 - Import script does not accept relative
 paths

---
 .../storageAdmin/bin/campcaster-import        |  6 +++--
 .../storageAdmin/var/campcaster-import.php    | 24 ++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/campcaster/src/modules/storageAdmin/bin/campcaster-import b/campcaster/src/modules/storageAdmin/bin/campcaster-import
index bd85618b1..b02967e08 100755
--- a/campcaster/src/modules/storageAdmin/bin/campcaster-import
+++ b/campcaster/src/modules/storageAdmin/bin/campcaster-import
@@ -43,8 +43,10 @@ fi
 filelistpathname=.
 
 #-------------------------------------------------------------------------------
-#   Do recursive import
+#   Do import
 #-------------------------------------------------------------------------------
+invokePwd=$PWD
+echo $invokePwd
 cd $phpdir
 
-php -q campcaster-import.php "$@" || exit 1
+php -q campcaster-import.php --dir "$invokePwd" "$@" || exit 1
diff --git a/campcaster/src/modules/storageAdmin/var/campcaster-import.php b/campcaster/src/modules/storageAdmin/var/campcaster-import.php
index fb5fbfc62..b6bd0b7a6 100644
--- a/campcaster/src/modules/storageAdmin/var/campcaster-import.php
+++ b/campcaster/src/modules/storageAdmin/var/campcaster-import.php
@@ -80,6 +80,7 @@ function import_err($p_pearErrorObj, $txt='')
  *
  * @param string $p_filepath
  *      You can pass in a directory or file name.
+ *      This must be the full absolute path to the file, not relative.
  * @param string $p_importMode
  * @param boolean $p_testOnly
  *
@@ -100,7 +101,6 @@ function camp_import_audio_file($p_filepath, $p_importMode = null, $p_testOnly =
 
     $fileCount = 0;
     $duplicates = 0;
-    $p_filepath = realpath(rtrim($p_filepath));
 
     if (!file_exists($p_filepath)) {
         echo " * WARNING: File does not exist: $p_filepath\n";
@@ -197,6 +197,7 @@ echo "Campcaster Import Script\n";
 echo "========================\n";
 $g_errors = 0;
 
+//print_r($argv);
 $start = intval(date('U'));
 
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
@@ -207,7 +208,8 @@ if (PEAR::isError($CC_DBC)) {
 }
 $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
 
-$parsedCommandLine = Console_Getopt::getopt($argv, "thcl", array("test", "help", "copy", "link"));
+$parsedCommandLine = Console_Getopt::getopt($argv, "thcld", array("test", "help", "copy", "link", "dir="));
+//print_r($parsedCommandLine);
 if (PEAR::isError($parsedCommandLine)) {
     printUsage();
     exit(1);
@@ -222,6 +224,7 @@ $files = $parsedCommandLine[1];
 
 $testonly = FALSE;
 $importMode = null;
+$currentDir = null;
 foreach ($cmdLineOptions as $tmpValue) {
     $optionName = $tmpValue[0];
     $optionValue = $tmpValue[1];
@@ -233,11 +236,14 @@ foreach ($cmdLineOptions as $tmpValue) {
         case "c":
         case "--copy":
             $importMode = "copy";
-            break 2;
+            break;
         case 'l':
         case '--link':
             $importMode = "link";
-            break 2;
+            break;
+        case '--dir':
+            $currentDir = $optionValue;
+            break;
         case "t":
         case "--test":
             $testonly = TRUE;
@@ -254,7 +260,11 @@ $filecount = 0;
 $duplicates = 0;
 if (is_array($files)) {
     foreach ($files as $filepath) {
-        list($tmpCount, $tmpDups) = camp_import_audio_file($filepath, $importMode, $testonly);
+        $fullPath = realpath($filepath);
+        if (!$fullPath && !is_null($currentDir)) {
+            $fullPath = "$currentDir/$filepath";
+        }
+        list($tmpCount, $tmpDups) = camp_import_audio_file($fullPath, $importMode, $testonly);
         $filecount += $tmpCount;
         $duplicates += $tmpDups;
     }
@@ -271,7 +281,9 @@ echo "==========================================================================
 echo " *** Import mode: $importMode\n";
 echo " *** Files imported: $filecount\n";
 echo " *** Duplicate files (not imported): $duplicates\n";
-echo " *** Errors: $g_errors\n";
+if ($g_errors > 0) {
+    echo " *** Errors: $g_errors\n";
+}
 echo " *** Total: ".($filecount+$duplicates)." files in $time seconds = $speed files/second.\n";
 echo "==========================================================================\n";