Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17263/modules/pftijah/Tests

Modified Files:
        procs.stable.out test_select_star3.stable.out 
Log Message:
propagated changes of Monday Jun 04 2007
from the XQuery_0-18 branch to the development trunk



Index: procs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/procs.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- procs.stable.out    1 Jun 2007 15:35:04 -0000       1.11
+++ procs.stable.out    4 Jun 2007 21:45:11 -0000       1.12
@@ -63,18 +63,21 @@
 [ "_del_doc(bit, BAT[any,str], BAT[oid,str], BAT[oid,str]) : bit"              
                                                                                
                                                                                
  ]
 [ "_del_doc_replace(BAT[oid,str], BAT[oid,str]) : void"                        
                                                                          ]
 [ "_getTermCollLH(oid, int, str) : dbl"                                        
                                                                                
                                                                          ]
-[ "_getTermDocLHs(oid, BAT[void,oid], str) : BAT[oid,dbl]"                     
                                                                                
                                                                  ]
+[ "_getTermDocLHs0(oid, BAT[void,oid], str) : BAT[oid,dbl]"                    
                                                                                
                                                                                
  ]
+[ "_getTermDocLHs1(oid, BAT[void,oid], str) : BAT[oid,dbl]"                    
                                                                                
                                                                                
  ]
 [ "_getTermPositions(oid, str) : BAT[void,oid]"                                
                                                                                
                                                                          ]
 [ "_runtime_create(str, lock, lock) : BAT[lock,BAT]"                           
                                                                          ]
 [ "_runtime_flush() : void"                                                    
                                                                  ]
 [ "_runtime_get(str) : BAT[lock,BAT]"                                          
                                                                  ]
-[ "_score_NLLR(dbl, dbl, BAT[oid,dbl], flt) : BAT[oid,dbl]"                    
                                                                                
                                                                  ]
+[ "_score_LM(int, int, dbl, BAT[oid,dbl], dbl) : BAT[oid,dbl]"                 
                                                                                
                                                                                
  ]
+[ "_score_LMs(int, int, dbl, BAT[oid,dbl], dbl) : BAT[oid,dbl]"                
                                                                                
                                                                                
          ]
+[ "_score_NLLR(int, int, dbl, BAT[oid,dbl], dbl) : BAT[oid,dbl]"               
                                                                                
                                                                                
  ]
 [ "_shred_doc_base(BAT[oid,str], BAT[void,str], BAT[void,str], lng) : 
BAT[oid,BAT]"                                                                   
   ]
 [ "_shred_doc_cleanup(lng, bit) : BAT[any,any]"                                
                                                                          ]
 [ "_shred_into_docBAT(BAT[str,BAT], BAT[void,str], BAT[void,str], 
BAT[void,timestamp], str, oid, lng) : oid"                                      
                                                                               ]
 [ "_shredlock_set(str, lng) : void"                                            
                                                                          ]
 [ "_shredlock_unset(str, lng) : void"                                          
                                                                          ]
-[ "_terms2void_tid(BAT[void,str], BAT[oid,str]) : BAT[void,oid]"               
                                                                                
                                                                  ]
+[ "_terms2void_tid(BAT[void,str], str) : BAT[void,oid]"                        
                                                                                
                                                                                
          ]
 [ "_timestr(lng) : str"                                                        
                                                                                
                                                                          ]
 [ "_tj_TagBat(str) : str"                                                      
                                                                                
                                                                                
  ]
 [ "_tj_TermBat(str) : str"                                                     
                                                                                
                                                                                
  ]
@@ -139,7 +142,6 @@
 [ "col_freq(BAT[oid,str]) : BAT[oid,dbl]"                                      
                                                                          ]
 [ "col_freq(oid, BAT[oid,str]) : dbl"                                          
                                                                          ]
 [ "cold(BAT[any::1,any::2]) : void"                                            
                                                                          ]
-[ "collTermCount(str, BAT[oid,int]) : BAT[oid,int]"                            
                                                                                
                                                                  ]
 [ "coll_lock_set(BAT[void,BAT], oid, int, str) : void"                         
                                                                          ]
 [ "coll_lock_unset(BAT[void,BAT], oid, int, str, lng) : void"                  
                                                                          ]
 [ "collection_cleanup(BAT[str,str]) : void"                                    
                                                                  ]
@@ -153,7 +155,7 @@
 [ "cosh(flt) : flt"                                                            
                                                                          ]
 [ "count_no_nil(BAT[any,any]) : int"                                           
                                                                          ]
 [ "cpu() : BAT[str,int]"                                                       
                                                                          ]
-[ "create_qenv(str, str, str) : BAT[oid,str]"                                  
                                                                          ]
+[ "create_qenv() : BAT[oid,str]"                                               
                                                                                
                                                                                
  ]
 [ "current_date() : date"                                                      
                                                                          ]
 [ "current_time() : daytime"                                                   
                                                                          ]
 [ "current_timestamp() : timestamp"                                            
                                                                          ]
@@ -465,18 +467,14 @@
 [ "outerjoin(BAT[any::1,any::2], BAT[any::2,any::3]) : BAT[any::1,any::3]"     
                                                                          ]
 [ "p_contained_by_sum(BAT[oid,dbl], BAT[oid,dbl], BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
               ]
 [ "p_contained_by_sum(BAT[oid,dbl], BAT[oid,str]) : BAT[oid,dbl]"              
                                                                          ]
-[ "p_containing_q_LM(BAT[oid,dbl], BAT[void,str], BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
               ]
-[ "p_containing_q_LMs(BAT[oid,dbl], BAT[void,str], BAT[any,any], flt, int, 
int, BAT[oid,str]) : BAT[oid,dbl]"                                            ]
-[ "p_containing_q_NLLR(BAT[oid,dbl], BAT[void,str], flt, str, BAT[oid,str]) : 
BAT[oid,dbl]"                                                              ]
-[ "p_containing_q_NLLR2(BAT[oid,dbl], BAT[void,str], flt, str, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
                                                                  ]
+[ "p_containing_q_LM(BAT[oid,dbl], BAT[void,str], str, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
                                                                                
          ]
+[ "p_containing_q_LMs(BAT[oid,dbl], BAT[void,str], str, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
                                                                                
         ]
+[ "p_containing_q_NLLR(BAT[oid,dbl], BAT[void,str], str, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
                                                                                
        ]
 [ "p_containing_q_NLLR_frag(BAT[oid,BAT], BAT[void,str], flt, BAT[oid,str]) : 
BAT[oid,BAT]"                                                              ]
-[ "p_containing_q_NLLR_mil(BAT[oid,dbl], BAT[void,str], flt, str, 
BAT[oid,str]) : BAT[oid,dbl]"                                                   
               ]
 [ "p_containing_t_LMs(BAT[oid,dbl], BAT[oid,dbl], flt, int, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                ]
 [ "p_containing_wsumd(BAT[oid,dbl], BAT[oid,dbl], int, BAT[oid,str]) : 
BAT[oid,dbl]"                                                                   
  ]
 [ "pagesample(BAT[oid,any]) : BAT[oid,void]"                                   
                                                                          ]
 [ "parent(BAT[void,oid], BAT[void,oid], oid, BAT[void,BAT], int) : 
BAT[void,BAT]"                                                                  
      ]
-[ "parent_child(BAT[oid,any], BAT[oid,any], BAT[oid,str]) : BAT[oid,oid]"      
                                                                          ]
-[ "parent_child_llscj(BAT[oid,any], BAT[oid,any], BAT[oid,str]) : 
BAT[oid,oid]"                                                                   
               ]
 [ "pf_assert(str, str) : void"                                                 
                                                                          ]
 [ "pf_checkpoint(BAT[void,str]) : bit"                                         
                                                                  ]
 [ "pf_logflush(lng) : void"                                                    
                                                                          ]
@@ -516,7 +514,6 @@
 [ "runtime(lock, lock) : BAT[lock,BAT]"                                        
                                                                                
                                                                          ]
 [ "save(BAT[any::1,any::2]) : BAT[any::1,any::2]"                              
                                                                          ]
 [ "scale(BAT[any,any], flt) : BAT[any,any]"                                    
                                                                                
                                                                  ]
-[ "score_NLLR_mil(BAT[oid,oid], BAT[void,int], BAT[oid,int], BAT[oid,int], 
BAT[oid,oid], dbl, int) : BAT[oid,dbl]"                                         
                                                                      ]
 [ "seconds(lng) : int"                                                         
                                                                          ]
 [ "seconds(timestamp) : int"                                                   
                                                                          ]
 [ "select_narrow(BAT[oid,oid], BAT[oid,oid], oid, BAT[void,BAT], int, 
BAT[void,oid], chr) : BAT[void,BAT]"                                       ]
@@ -621,7 +618,6 @@
 [ "tj_ping() : void"                                                           
                                                                                
                                                                  ]
 [ "tj_play_doc_tape(BAT[void,BAT], BAT[void,oid], BAT[void,int], 
BAT[void,lng], BAT[void,str]) : void"                                           
                                                                                
]
 [ "tj_setBackgroundCollName(str, BAT[oid,str]) : BAT[void,str]"                
                                                                                
  ]
-[ "tj_setScoreBase(int, BAT[oid,str]) : BAT[void,str]"                         
                                                                          ]
 [ "tj_set_parameter(str, str, str) : void"                                     
                                                                                
                                                                  ]
 [ "tj_trace(str) : void"                                                       
                                                                                
                                                                  ]
 [ "tj_url2Collection(str, str, str, str) : void"                               
                                                                                
                                                                  ]

Index: test_select_star3.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_select_star3.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test_select_star3.stable.out        30 May 2007 14:08:10 -0000      1.3
+++ test_select_star3.stable.out        4 Jun 2007 21:45:12 -0000       1.4
@@ -22,16 +22,16 @@
 # 13:49:22 >  
 
 <?xml version="1.0" encoding="utf-8"?>
-<XQueryResult><node rank="1"><title>XML definitions</title></node><node 
rank="2"><title>XML databases</title></node><node rank="3"><title>XML 
Information retrieval</title></node><node rank="4"><para id="par2">This section 
is about XML databases.</para></node><node rank="5"><para id="par4">This 
section is about XML information retrieval.</para></node><node rank="6"><para 
id="par9">This section contains definitions that are used in XML databases 
-                  and XML information retrieval</para></node><node 
rank="7"><para id="par5">It contains the words XML, information and retrieval 
many times, 
+<XQueryResult><node rank="1"><title>XML Information 
retrieval</title></node><node rank="2"><para id="par4">This section is about 
XML information retrieval.</para></node><node rank="3"><title>XML 
definitions</title></node><node rank="4"><para id="par5">It contains the words 
XML, information and retrieval many times, 
                   more than say databases. 
                   It should be more relevant to XML information retrieval 
-                  than the previous section.</para></node><node rank="8"><para 
id="par3">It contains the words XML and databases many times, 
+                  than the previous section.</para></node><node 
rank="5"><title>XML databases</title></node><node rank="6"><para id="par9">This 
section contains definitions that are used in XML databases 
+                  and XML information retrieval</para></node><node 
rank="7"><para id="par2">This section is about XML 
databases.</para></node><node rank="8"><para id="par8">This section is about 
the TIJAH XML information retrieval 
+                  system. This section is more about TIJAH than any other 
section is 
+                  about TIJAH.</para></node><node rank="9"><para id="par3">It 
contains the words XML and databases many times, 
                   more than say information and retrieval. 
                   It should be more relevant to XML databases than 
-                  the next section.</para></node><node rank="9"><para 
id="par8">This section is about the TIJAH XML information retrieval 
-                  system. This section is more about TIJAH than any other 
section is 
-                  about TIJAH.</para></node></XQueryResult>
+                  the next section.</para></node></XQueryResult>
 
 # 13:49:22 >  
 # 13:49:22 >  Done.


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to