[Exist-commits] eXist-1.0/src/org/exist/storage NativeTextEngine.java,1.61,1.62

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14522/src/org/exist/storage

Modified Files:
	NativeTextEngine.java 
Log Message:
Changed NativeTextEngine.getNodesRegexp to work again (forgot term
frequency counts).

Index: NativeTextEngine.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeTextEngine.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** NativeTextEngine.java	16 Jul 2004 17:39:41 -0000	1.61
--- NativeTextEngine.java	19 Jul 2004 08:12:29 -0000	1.62
***************
*** 1265,1268 ****
--- 1265,1269 ----
  				long gid;
  				long last = -1;
+ 				int freq = 1;
  				long delta;
  				int sizeHint = -1;
***************
*** 1270,1273 ****
--- 1271,1275 ----
  				DocumentImpl doc;
  				NodeProxy parent, proxy;
+ 				Match match;
  				try {
  					while (is.available() > 0) {
***************
*** 1278,1282 ****
  						len = is.readInt();
  						if ((doc = docs.getDoc(docId)) == null) {
! 							is.skip(len);
  							continue;
  						}
--- 1280,1284 ----
  						len = is.readInt();
  						if ((doc = docs.getDoc(docId)) == null) {
! 							is.skip(termFreq ? len * 2 : len);
  							continue;
  						}
***************
*** 1288,1291 ****
--- 1290,1295 ----
  							gid = (last < 0 ? delta : last + delta);
  							last = gid;
+ 							if(termFreq)
+ 								freq = is.readInt();
  							if (contextSet != null) {
  								proxy = (section == TEXT_SECTION
***************
*** 1298,1303 ****
  								if (parent != null) {
  									result.add(parent, sizeHint);
! 									if (trackMatches != Serializer.TAG_NONE)
! 										parent.addMatch(new Match(word, gid));
  								}
  							} else
--- 1302,1310 ----
  								if (parent != null) {
  									result.add(parent, sizeHint);
! 									if (trackMatches != Serializer.TAG_NONE) {
! 										match = new Match(word, gid);
! 										match.setFrequency(freq);
! 										parent.addMatch(match);
! 									}
  								}
  							} else