add folder separation.

diff --git a/index/pdf2xml.py b/index/pdf2xml.py
index d94f411..8aaedc2 100644 (file)
--- a/index/pdf2xml.py
+++ b/index/pdf2xml.py
@@ -41,12 +41,11 @@ try:
 except:
     cacheLimit=1000
 if (extendJpeg==1):
-    if not(os.path.exists(cacheFolder)):
-        os.system("mkdir \""+cacheFolder+"\"")
-        os.system("mkdir \""+cacheFolder+"/orig/\"")
-        os.system("mkdir \""+cacheFolder+"/900/\"")
-        os.system("mkdir \""+cacheFolder+"/2000/\"")
-        os.system("chmod -R 777 \""+cacheFolder+"\"")
+    os.system("mkdir \""+cacheFolder+"\"")
+    os.system("mkdir \""+cacheFolder+"/orig/\"")
+    os.system("mkdir \""+cacheFolder+"/900/\"")
+    os.system("mkdir \""+cacheFolder+"/2000/\"")
+    os.system("chmod -R 777 \""+cacheFolder+"\"")
 dbcon=sqlite3.connect(sqlpath,isolation_level=None)
 try:
     sql = u"""
@@ -165,13 +164,17 @@ def TEXT2solr(solrcon,titletxt,textpath,pagenum,pagemax,pdfpath,idnum):
     #print sdata
     solrcon.add(sdata)
 def generateCache(pdfpath,filename,pagenum):
-    cacheJpegPath=cacheFolder+"/orig/"+filename+"_orig.jpg"
+    foldername=os.path.splitext(os.path.basename(pdfpath))[0].encode("utf-8")
+    os.system("mkdir \""+cacheFolder+"/orig/"+foldername+"/"+"\"")
+    os.system("mkdir \""+cacheFolder+"/900/"+foldername+"/"+"\"")
+    os.system("chmod -R 777 \""+cacheFolder+"\"")
+    cacheJpegPath=cacheFolder+"/orig/"+foldername+"/"+filename+".jpg"
     if extendJpeg==1:
         os.system("pdfimages -j -f "+str(pagenum)+" -l "+str(pagenum)+" \""+pdfpath+"\" \""+cacheFolder+"/"+filename+"\"")
         os.system("mv \""+cacheFolder+"/"+filename+"-000.jpg\" \""+cacheJpegPath+"\"")
         os.system("jpegtran -copy none -optimize -outfile \""+cacheJpegPath+"\" \""+cacheJpegPath+"\"")
     if adjustForiOS==1:
-        cacheMobileJpegPath=cacheFolder+"/900/"+filename+"_mobile.jpg"
+        cacheMobileJpegPath=cacheFolder+"/900/"+foldername+"/"+filename+".jpg"
         os.system("gm convert -quality 60 -size 900x1704 -resize 900x1704\\> \""+cacheJpegPath+"\" \""+cacheMobileJpegPath+"\"")
         os.system("jpegtran -copy none -optimize -outfile \""+cacheMobileJpegPath+"\" \""+cacheMobileJpegPath+"\"")
 argvs=sys.argv

diff --git a/www/jpegserver.pl b/www/jpegserver.pl
index 1917677..3766aab 100755 (executable)
--- a/www/jpegserver.pl
+++ b/www/jpegserver.pl
@@ -63,8 +63,8 @@ else {
        system "mkdir /tmp/libre10";
 }
 $tmpcachepath    = $outputpath;
-$cachepathmobile = "$cachepath/900/$filetitle" + "_$pagenum" + "_mobile.jpg";
-$cachepath       = "$cachepath/orig/$filetitle" + "_$pagenum" + "_orig.jpg";
+$cachepathmobile = "$cachepath/900/$filetitle/$filetitle" + "_$pagenum" + ".jpg";
+$cachepath       = "$cachepath/orig/$filetitle/$filetitle" + "_$pagenum" + ".jpg";
 $useCache        = ( -e $cachepath );
 if ($useCache) {
        $outputpathjpg = $cachepath;