[Mulgara-svn] r2037 - trunk/jxdata/iTQL/fulltext_queries

[alexhall at mulgara.org]

Author: alexhall
Date: 2011-09-23 15:04:20 +0000 (Fri, 23 Sep 2011)
New Revision: 2037

Modified:
   trunk/jxdata/iTQL/fulltext_queries/queryResult19.txt
   trunk/jxdata/iTQL/fulltext_queries/test.jxu
Log:
Modify jxunit tests and expected results to account for changes to scoring of wildcard patterns in the new Lucene version

Modified: trunk/jxdata/iTQL/fulltext_queries/queryResult19.txt
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/queryResult19.txt	2011-09-23 15:03:29 UTC (rev 2036)
+++ trunk/jxdata/iTQL/fulltext_queries/queryResult19.txt	2011-09-23 15:04:20 UTC (rev 2037)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><pmid/><title/><sc1/><sc2/></variables><solution><pmid resource="urn:pmid:11076294"/><title>[Ultrastructural phenotypes of tumor cells of endocrine-cellular neoplasms of hepatopancreatoduodenal organs and their role in determining the degree of malignancy and prognosis of these diseases]</title><sc1 datatype="http://www.w3.org/2001/XMLSchema#double">1.20</sc1><sc2 datatype="http://www.w3.org/2001/XMLSchema#double">0.92</sc2></solution></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><pmid/><title/><sc1/><sc2/></variables><solution><pmid resource="urn:pmid:11076294"/><title>[Ultrastructural phenotypes of tumor cells of endocrine-cellular neoplasms of hepatopancreatoduodenal organs and their role in determining the degree of malignancy and prognosis of these diseases]</title><sc1 datatype="http://www.w3.org/2001/XMLSchema#double">1.20</sc1><sc2 datatype="http://www.w3.org/2001/XMLSchema#double">1.0</sc2></solution></query></answer>

Modified: trunk/jxdata/iTQL/fulltext_queries/test.jxu
===================================================================
--- trunk/jxdata/iTQL/fulltext_queries/test.jxu	2011-09-23 15:03:29 UTC (rev 2036)
+++ trunk/jxdata/iTQL/fulltext_queries/test.jxu	2011-09-23 15:04:20 UTC (rev 2037)
@@ -341,7 +341,7 @@
              $x <http://mulgara.org/mulgara/Document#title> 'Diseases' in <@server@#fulltext2> and
              $x <http://mulgara.org/mulgara#score> $sc1 in <@server@#fulltext2>) or
             ($pmid <http://mulgara.org/mulgara#search> $y in <@server@#fulltext2> and
-             $y <http://mulgara.org/mulgara/Document#title> 'Heart*' in <@server@#fulltext2> and
+             $y <http://mulgara.org/mulgara/Document#title> 'Heart' in <@server@#fulltext2> and
              $y <http://mulgara.org/mulgara#score> $sc2 in <@server@#fulltext2>))
            order by $pmid $title;"/>
 
@@ -359,7 +359,7 @@
     value="select $pmid $title $sc1 $sc2 from <@server@#model1>
            where $pmid <http://mulgara.org/mulgara/Document#title> $title and
            $pmid <http://mulgara.org/mulgara#search> $x in <@server@#fulltext2> and
-           $x <http://mulgara.org/mulgara/Document#title> 'Diseases*' in <@server@#fulltext2> and
+           $x <http://mulgara.org/mulgara/Document#title> 'Diseases' in <@server@#fulltext2> and
            $x <http://mulgara.org/mulgara#score> $sc1 in <@server@#fulltext2> and
            $pmid <http://mulgara.org/mulgara#search> $y in <@server@#fulltext2> and
            $y <http://mulgara.org/mulgara/Document#title> 'pheno*' in <@server@#fulltext2> and
@@ -368,7 +368,6 @@
 
   <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
   <subst name="queryResult" regexp="1\.(20|21)[0-9]*" value="1.20"/>
-  <subst name="queryResult" regexp="0\.(92|93)[0-9]*" value="0.92"/>
   <ifEqual converse="true" file="queryResult19.txt" name="queryResult">
     <save name="queryResult" file="badQuery19Result.xml"/>
     <fail>Output failed.  Check badQuery19Result.xml for output.</fail>