[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/search/client addMessageCallback,1.1.1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/search/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32572

Modified Files:
	addMessageCallback 
Log Message:
reworked, using mainResponder.search.client.index seems severely broken

Index: addMessageCallback
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/search/client/addMessageCallback,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** addMessageCallback	26 Mar 2005 21:46:10 -0000	1.1.1.1
--- addMessageCallback	9 Feb 2006 02:43:59 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:mainResponder.search.client.addMessageCallback
  
! on addMessageCallback (adrObject) {
	ÇWhenever a DG message is new or changed, this callback gets called.
	try {mainResponder.search.client.index (adrObject)};
	return (true)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:mainResponder.search.client.addMessageCallback
  
! on addMessageCallback (adrObject) {
	ÇChanges
		Ç1/14/06; 9:59:44 AM by TAC
			Çreworked, using mainResponder.search.client.index seems severely broken
		ÇWhenever a DG message is new or changed, this callback gets called.
	
	try { // index message
		local (pta = html.getPageTableAddress ());
		
		Çscratchpad.pt = pta^ // for testing
		
		local (adrMessageTable, text, url);
		
		case true {
			defined (pta^.adrEditedMsg) {
				adrMessageTable = pta^.adrEditedMsg};
			defined (pta^.adrNewMsg) {
				adrMessageTable = pta^.adrNewMsg}};
		
		text = string (adrMessageTable^.body);
		
		if defined (adrMessageTable^.alsoListedIn) {
			if adrMessageTable^.alsoListedIn contains "stories" { // could be more robust
				url = pta^.urls^.storyReader + adrMessageTable^.msgNum}}
		else {
			url = pta^.urls^.discussMsgReader + adrMessageTable^.msgNum};
		
		if defined (pta^.search^.flProcessMacros) { // perhaps process macros
			if pta^.search^.flProcessMacros {
				local (oldPta, pt);
				
				new (tableType, @pt);
				
				pt.adrMsgToEdit = adrMessageTable;
				
				try {
					oldPta = html.getPageTableAddress ()};
				
				if oldPta == nil {
					Çpt.adrMsgToEdit = adrMsgTable
					pt.adrObject = nil;
					pt.adrSiteRootTable = adrSite;
					pt.glossary = @adrSite^.["#glossary"]}
				else {
					pt.adrObject = oldPta^.adrObject;
					pt.adrSiteRootTable = oldPta^.adrSiteRootTable;
					pt.glossary = oldPta^.glossary};
				
				html.setPageTableAddress (@pt);
				
				text = html.processMacros (text, adrPageTable: @pt);
				
				if oldPta == nil {
					html.deletePageTableAddress ()}
				else {
					html.setPageTableAddress (oldPta)}}};
		
		mainResponder.search.server.storePageForIndexing (adrMessageTable^.subject, url, text, pta^.search^.siteName, pta^.ftpSite^.url, pta^.client, config.mainresponder.search.prefs.flStoreFullText, createdDate: adrMessageTable^.postTime, lastModDate: adrMessageTable^.lastUpdate)};
	
	return (true)};

Çbundle // testing
	Çhtml.setPageTableAddress (@scratchpad.pt)
	Ç
	ÇaddMessageCallback (@scratchpad.pt.adrObject)
	Ç
	Çhtml.deletePageTableAddress ()
\ No newline at end of file