diff --git a/tests/embed/embed.sh b/tests/embed/embed.sh index 345bc64f..e8bc518f 100755 --- a/tests/embed/embed.sh +++ b/tests/embed/embed.sh @@ -4,12 +4,9 @@ topdir=`dirname $0`/.. . $topdir/shared.sh initvariables $0 -( -for q in xing;do - echo $q - recollq -q $q -done +( + recollq -S url -q xing dir:embed ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/embed/embed.txt b/tests/embed/embed.txt index cfe488ea..4c643b6c 100644 --- a/tests/embed/embed.txt +++ b/tests/embed/embed.txt @@ -1,5 +1,2 @@ -xing -3 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [video+recdat] 1027 bytes -application/msword [file:///home/dockes/projets/fulltext/testrecoll/msword/xingfx1.doc] [xingfx1.doc] 24576 bytes +1 results application/msword [file:///home/dockes/projets/fulltext/testrecoll/embed/thunderbirdlocalfolders.zip] [xingfx1.doc] 24576 bytes diff --git a/tests/lyx/lyx.sh b/tests/lyx/lyx.sh index 4dfea548..19ca6b5b 100755 --- a/tests/lyx/lyx.sh +++ b/tests/lyx/lyx.sh @@ -6,9 +6,9 @@ topdir=`dirname $0`/.. initvariables $0 ( -recollq -S mtime 'Bienvenue Dans Univers De Lyx' -recollq -S mtime 'Welcome To Lyx' -recollq -S mtime 'LyX jol dokumentalt' +recollq -S url 'Bienvenue Dans Univers De Lyx' +recollq -S url 'Welcome To Lyx' +recollq -S url 'LyX jol dokumentalt' ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt index 2ce9b069..dfff4844 100644 --- a/tests/lyx/lyx.txt +++ b/tests/lyx/lyx.txt @@ -2,7 +2,7 @@ application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/accentué.lyx] [accentué.lyx] 3577 bytes application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/fr_splash.lyx] [fr_splash.lyx] 3577 bytes 2 results -application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/with spaces.lyx] [with spaces.lyx] 2974 bytes application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/splash.lyx] [splash.lyx] 2974 bytes +application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/with spaces.lyx] [with spaces.lyx] 2974 bytes 1 results application/x-lyx [file:///home/dockes/projets/fulltext/testrecoll/lyx/hu_splash.lyx] [hu_splash.lyx] 4773 bytes diff --git a/tests/msword/msword.sh b/tests/msword/msword.sh index f4b957e9..bc545f36 100755 --- a/tests/msword/msword.sh +++ b/tests/msword/msword.sh @@ -6,8 +6,8 @@ topdir=`dirname $0`/.. initvariables $0 ( -recollq '"Evenements et programme 2006"' -recollq 'pcx11 manuel de programmation iamactuallyanrtf' +recollq -S url '"Evenements et programme 2006"' +recollq -S url 'pcx11 manuel de programmation iamactuallyanrtf' ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/partialpurge/partialpurge.sh b/tests/partialpurge/partialpurge.sh index 49111c70..dfc37c8e 100755 --- a/tests/partialpurge/partialpurge.sh +++ b/tests/partialpurge/partialpurge.sh @@ -14,7 +14,7 @@ d=${tstdata}/partialpurge/ recollindex -Zi $d/testmbox echo Should have 2 results: testmbox and longmbox: - recollq -q deletedmessageuniqueterm + recollq -S url -q deletedmessageuniqueterm echo echo Changing file and reindexing @@ -22,17 +22,17 @@ d=${tstdata}/partialpurge/ recollindex -Zi $d/testmbox echo Should have 1 result: longmbox: - recollq -q deletedmessageuniqueterm + recollq -S url -q deletedmessageuniqueterm echo echo Purging whole test file recollindex -e $d/testmbox echo Should have 1 result: longmbox: - recollq -q deletedmessageuniqueterm + recollq -S url -q deletedmessageuniqueterm echo Should have 2 results: longmbox shortmbox: - recollq -q stablemessageuniqueterm + recollq -S url -q stablemessageuniqueterm ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/pythonapi/doc.py b/tests/pythonapi/doc.py index 1002dfc0..12519133 100644 --- a/tests/pythonapi/doc.py +++ b/tests/pythonapi/doc.py @@ -34,11 +34,11 @@ for doc in query: for fld in ('title', 'testfield', 'filename'): print("getattr(doc, %s) -> [%s]"%(fld,utf8string(getattr(doc, fld)))) print("doc.get(%s) -> [%s]"%(fld,utf8string(doc.get(fld)))) - print("\nfor fld in doc.keys():") - for fld in doc.keys(): + print("\nfor fld in sorted(doc.keys()):") + for fld in sorted(doc.keys()): print(utf8string("[%s] -> [%s]" % (fld, getattr(doc, fld)))) - print("\nfor k,v in doc.items().items():") - for k,v in doc.items().items(): + print("\nfor k,v in sorted(doc.items().items()):") + for k,v in sorted(doc.items().items(), key=lambda itm: itm[0]): print(utf8string("[%s] -> [%s]" % (k, v))) print("\nAccented query:") diff --git a/tests/pythonapi/pythonapi.txt b/tests/pythonapi/pythonapi.txt index 1ea39487..931156bd 100644 --- a/tests/pythonapi/pythonapi.txt +++ b/tests/pythonapi/pythonapi.txt @@ -10,7 +10,7 @@ doc.get(testfield) -> [testfieldvalue1] getattr(doc, filename) -> [htmlfield1.html] doc.get(filename) -> [htmlfield1.html] -for fld in doc.keys(): +for fld in sorted(doc.keys()): [abstract] -> [ ThisIsTheFieldHtmlTestFile] [caption] -> [HTML fields test file: été à noël] [dbytes] -> [27] @@ -24,29 +24,29 @@ for fld in doc.keys(): [pcbytes] -> [267] [rcludi] -> [/home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html|] [relevancyrating] -> [100%] -[sig] -> [2671383154417] +[sig] -> [2671402138880] [testfield] -> [testfieldvalue1] [title] -> [HTML fields test file: été à noël] [url] -> [file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html] -for k,v in doc.items().items(): -[testfield] -> [testfieldvalue1] -[ipath] -> [] -[url] -> [file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html] +for k,v in sorted(doc.items().items()): [abstract] -> [ ThisIsTheFieldHtmlTestFile] -[pcbytes] -> [267] +[caption] -> [HTML fields test file: été à noël] +[dbytes] -> [27] [fbytes] -> [267] [filename] -> [htmlfield1.html] -[mtype] -> [text/html] -[caption] -> [HTML fields test file: été à noël] [fmtime] -> [01383154417] -[dbytes] -> [27] -[sig] -> [2671383154417] +[ipath] -> [] [mtime] -> [01383154417] -[title] -> [HTML fields test file: été à noël] +[mtype] -> [text/html] +[origcharset] -> [utf-8] +[pcbytes] -> [267] [rcludi] -> [/home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html|] [relevancyrating] -> [100%] -[origcharset] -> [utf-8] +[sig] -> [2671402138880] +[testfield] -> [testfieldvalue1] +[title] -> [HTML fields test file: été à noël] +[url] -> [file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html] Accented query: User query [title:"été à noël"] diff --git a/tests/utfInPath/utfInPath.sh b/tests/utfInPath/utfInPath.sh index e738cbb8..37da7240 100755 --- a/tests/utfInPath/utfInPath.sh +++ b/tests/utfInPath/utfInPath.sh @@ -7,8 +7,8 @@ initvariables $0 ( -recollq -S mtime -q '"simulating shock turbulence interactions"' -recollq -S mtime Utf8pathunique +recollq -S url -q '"simulating shock turbulence interactions"' +recollq -S url Utf8pathunique ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/utfInPath/utfInPath.txt b/tests/utfInPath/utfInPath.txt index d9fddcbf..704b4617 100644 --- a/tests/utfInPath/utfInPath.txt +++ b/tests/utfInPath/utfInPath.txt @@ -1,6 +1,6 @@ 2 results -image/vnd.djvu [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/1999_Hu_Shu.OCR.djvu] [1999_Hu_Shu.OCR.djvu] 753409 bytes image/vnd.djvu [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/1999_Hu_Shu.OCR.djvu] [1999_Hu_Shu.OCR.djvu] 753409 bytes +image/vnd.djvu [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/1999_Hu_Shu.OCR.djvu] [1999_Hu_Shu.OCR.djvu] 753409 bytes 2 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/utf8path.txt] [utf8path.txt] 49 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/utf8path.txt] [utf8path.txt] 49 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/utf8path.txt] [utf8path.txt] 49 bytes