[sword-svn] r2310 - trunk/utilities/diatheke

[benpmorgan at crosswire.org]

Author: benpmorgan
Date: 2009-04-08 23:11:34 -0700 (Wed, 08 Apr 2009)
New Revision: 2310

Modified:
   trunk/utilities/diatheke/corediatheke.cpp
Log:
Make av11n work.



Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp	2009-04-09 05:45:25 UTC (rev 2309)
+++ trunk/utilities/diatheke/corediatheke.cpp	2009-04-09 06:11:34 UTC (rev 2310)
@@ -125,6 +125,7 @@
 		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
 	}
 	VerseKey vk;
+	VerseKey *parser;
 
 	//deal with queries to "system"
 	if (!::stricmp(text, "system")) {
@@ -141,6 +142,7 @@
 		return;
 	}
 	target = (*it).second;
+	parser = (VerseKey*) target->CreateKey();
 
 	if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
 		if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) {
@@ -267,8 +269,7 @@
 		*output << "\"-- ";
 
  		if (range) {
- 			VerseKey parser;
- 			ListKey scope = parser.ParseVerseList(range, parser, true);
+ 			ListKey scope = parser->ParseVerseList(range, "Gen 1:1", true);
  			listkey = target->Search(ref, st, REG_ICASE, &scope);
  		}
  		else listkey = target->Search(ref, st, REG_ICASE);
@@ -374,7 +375,7 @@
 			}
 		}
 		
- 		listkey = vk.ParseVerseList(ref, "Gen1:1", true);
+ 		listkey = parser->ParseVerseList(ref, "Gen1:1", true);
 		int i;
 
 		if (outputformat == FMT_RTF) {
@@ -477,5 +478,6 @@
 		}
 
 	}
+	delete parser;
 }