add basename for multi scan and better clean up

diff --git a/scanbasic.sh b/scanbasic.sh
index 168f7114c8067ec13a768e4074f84a3d596a6ad6..08d5c22e4fb06ce89549a96b47e14fe0c8467aaa 100644 (file)
--- a/scanbasic.sh
+++ b/scanbasic.sh
@@ -44,20 +44,26 @@ createpdf()
 {
        local start=$1
        local end=$2
+       local basename=$3
        local countno=
        local pdfs=()
 
+       if [ -z "$basename" ]; then
+               basename="out"
+       fi
+
        for i in $(seq $start $end); do
                countno=$(printf "%03d" $i)
                pdfs=$(echo $pdfs "scanned$countno.pdf")
        done
 
-       pdftk $pdfs output out$(printf "%03d" $start).pdf
-       addocr out$(printf "%03d" $start).pdf
+       pdftk $pdfs output $basename$(printf "%03d" $start).pdf
 
        for i in $pdfs; do
                rm $i
        done
+
+       addocr $basename$(printf "%03d" $start).pdf
 }
 
 detectsplit()
@@ -77,6 +83,7 @@ detectsplit()
 createmultipdfs()
 {
        local trenn=$1
+       local basename=$2
        local startcount=1
        local endcount=1
        local pdf=
@@ -87,9 +94,9 @@ createmultipdfs()
                trenn=$(detectsplit $pdf)
                rm $i
                if [ "$trenn" == "true" ]; then
-                       createpdf $startcount $((endcount - 1))
-                       startcount=$((endcount + 1))
                        rm $pdf
+                       createpdf $startcount $((endcount - 1)) $basename
+                       startcount=$((endcount + 1))
                fi
                ((endcount++))
        done

diff --git a/scantopdf b/scantopdf
index 214f6db54f4e9892484868a193929ac38f76c362..768800fe1d018f5bf5823c2d7f5f6f180df2439f 100755 (executable)
--- a/scantopdf
+++ b/scantopdf
@@ -16,6 +16,7 @@ main()
 
        local pagecount=$1
        local output=$2
+       local basename=$3
 
        scanimage --source=DocumentFeeder \
                --mode=Color \
@@ -33,7 +34,7 @@ main()
        fi
 
        if [ "$output" == "multi" ]; then
-               createmultipdfs $pagecount
+               createmultipdfs $pagecount $basename
                exit 0
        fi
 

diff --git a/scantopdfbw b/scantopdfbw
index 449a57c36aa87c659f9b9d43f03a96c426286bd1..c25dfedad6b8f62b7241d38fe8e29f4548b52195 100755 (executable)
--- a/scantopdfbw
+++ b/scantopdfbw
@@ -16,6 +16,7 @@ main()
 
        local pagecount=$1
        local output=$2
+       local basename=$3
 
        scanimage --source=DocumentFeeder \
                --mode=BW \
@@ -33,7 +34,7 @@ main()
        fi
 
        if [ "$output" == "multi" ]; then
-               createmultipdfs $pagecount
+               createmultipdfs $pagecount $basename
                exit 0
        fi
 

diff --git a/scantopdfgray b/scantopdfgray
index 244df2ce955470c8478f60d84374a470e21ce316..224fb5e19e8ea289b50a77863d865bcf334eeeab 100755 (executable)
--- a/scantopdfgray
+++ b/scantopdfgray
@@ -16,6 +16,7 @@ main()
 
        local pagecount=$1
        local output=$2
+       local basename=$3
 
        scanimage --source=DocumentFeeder \
                --mode=Gray \
@@ -33,7 +34,7 @@ main()
        fi
 
        if [ "$output" == "multi" ]; then
-               createmultipdfs $pagecount
+               createmultipdfs $pagecount $basename
                exit 0
        fi