fbdoc: separate methods for loading a page and the index in CWikiCon.LoadPage() and LoadIndex()

Author: jayrm

doc/fbchkdoc/getindex.bas

@@ -326,7 +326,7 @@ else
 		end if
 
 		print "Loading '" + sPage + "': ";
-		if( wikicon->LoadPage( sPage, FALSE, FALSE, sBody ) = FALSE ) then
+		if( wikicon->LoadIndex( sPage, sBody ) = FALSE ) then
 			print "Error"
 		else
 			print "OK"

doc/fbchkdoc/putpage.bas

@@ -137,7 +137,7 @@ if( app_opt.pageCount > 0 ) then
 			print "Unable to load"
 		else
 			print "OK"
-			if( wikicon->LoadPage( sPage, TRUE, TRUE, sBodyOld ) <> FALSE ) then
+			if( wikicon->LoadPage( sPage, sBodyOld ) <> FALSE ) then
 				if( wikicon->GetPageID() > 0 ) then
 					if( wikicon->Login( app_opt.wiki_username, app_opt.wiki_password ) ) = FALSE then
 						print "Unable to login"

doc/libfbdoc/CWikiCon.bas

@@ -40,21 +40,32 @@ namespace fb.fbdoc
 	'':::::
 	function CWikiCon.LoadPage _
 		( _
-			byval page as zstring ptr, _
-			byval israw as integer, _
-			byval getid as integer, _
+			byval pagename as zstring ptr, _
 			byref body as string _
 		) as boolean
 
+		body = ""
+		function = false
+
+	end function
+
+	'':::::
+	function CWikiCon.LoadIndex _
+		( _
+			byval pagename as zstring ptr, _
+			byref body as string _
+		) as boolean
+
+		body = ""
 		function = false
 
 	end function
 
 	'':::::
 	function CWikiCon.StorePage _
 		( _
-			byval sPage as zstring ptr, _
-			byval sBody as zstring ptr _
+			byval body as zstring ptr, _
+			byval note as zstring ptr _
 		) as boolean
 
 		function = false

doc/libfbdoc/CWikiCon.bi

@@ -30,16 +30,20 @@ namespace fb.fbdoc
 
 		declare virtual function LoadPage _
 			( _
-				byval page as zstring ptr, _
-				byval israw as integer, _
-				byval getid as integer, _
+				byval pagename as zstring ptr, _
+				byref body as string _
+			) as boolean
+
+		declare virtual function LoadIndex _
+			( _
+				byval pagename as zstring ptr, _
 				byref body as string _
 			) as boolean
 
 		declare virtual function StorePage _
 			( _
-				byval sPage as zstring ptr, _
-				byval sBody as zstring ptr _
+				byval body as zstring ptr, _
+				byval note as zstring ptr _
 			) as boolean
 
 		declare virtual function StoreNewPage _

doc/libfbdoc/CWikiConUrl.bas

@@ -372,10 +372,49 @@ namespace fb.fbdoc
 
 	'':::::
 	function CWikiConUrl.LoadPage _
+		( _
+			byval pagename as zstring ptr, _
+			byref body as string _
+		) as boolean
+
+		function = FALSE
+		body = ""
+		
+		if( ctx = NULL ) then
+			exit function
+		end if
+
+		ctx->pageid = -1
+		ctx->pagename = reallocate( ctx->pagename, len( *pagename ) + 1 )
+		*ctx->pagename = *pagename
+		
+		dim as CHttpStream ptr stream
+		
+		stream = new CHttpStream( ctx->http )
+		if( stream = NULL ) then
+			exit function
+		end if
+			
+		dim URL as string
+		URL = build_url( ctx, NULL, @wakka_raw )
+
+		if( stream->Receive( URL, TRUE, ctx->ca_file ) ) then
+			body = stream->Read()
+			remove_http_headers( body )
+		end if
+		
+		delete stream
+		
+		ctx->pageid = get_pageid( ctx )
+		
+		function = TRUE
+		
+	end function
+
+	'':::::
+	function CWikiConUrl.LoadIndex _
 		( _
 			byval page as zstring ptr, _
-			byval israw as integer, _
-			byval getid as integer, _
 			byref body as string _
 		) as boolean
 
@@ -397,43 +436,30 @@ namespace fb.fbdoc
 			exit function
 		end if
 
-		dim as zstring ptr rawmethod = iif( israw, @wakka_raw, NULL )
-		
 		dim URL as string
-		URL = build_url( ctx, NULL, rawmethod )
+		URL = build_url( ctx, NULL, NULL )
 
 		if( stream->Receive( URL, TRUE, ctx->ca_file ) ) then
 			body = stream->Read()
 			remove_http_headers( body )
-''			remove_trailing_whitespace( body )
 		end if
 
 		delete stream
 
-		if( getid ) then
-			'if( len( body ) > 0 ) then
-				ctx->pageid = get_pageid( ctx )
-			'else
-			'	ctx->pageid = -1
-			'end if
-		else
-				ctx->pageid = -1
-		end if	
+		ctx->pageid = -1
 
-		''body += chr( 13, 10 )
-		
 		function = TRUE
 
 	end function
 
 	'':::::
 	function CWikiConUrl.StorePage _
 		( _
-			byval body_in as zstring ptr, _
+			byval body as zstring ptr, _
 			byval note as zstring ptr _
 		) as boolean
 
-		dim body as string
+		dim body_out as string
 
 		if( ctx = NULL ) then
 			return FALSE
@@ -452,9 +478,9 @@ namespace fb.fbdoc
 
 		form->Add( "wakka", *ctx->pagename + wakka_edit )
 		form->Add( "previous",  ctx->pageid )
-		body = *body_in
-''		remove_trailing_whitespace( body )
-		form->Add( "body", body, "text/html" )
+		body_out = *body
+
+		form->Add( "body", body_out, "text/html" )
 		if( note ) then
 			form->Add( "note", *note )
 		else

doc/libfbdoc/CWikiConUrl.bi

@@ -49,8 +49,12 @@ namespace fb.fbdoc
 		declare function LoadPage _
 			( _
 				byval page as zstring ptr, _
-				byval israw as integer, _
-				byval getid as integer = TRUE, _
+				byref body as string _
+			) as boolean
+
+		declare function LoadIndex _
+			( _
+				byval page as zstring ptr, _
 				byref body as string _
 			) as boolean
 

doc/libfbdoc/fbdoc_loader.bas

@@ -80,7 +80,7 @@ namespace fb.fbdoc
 		if( bLoadPage ) then
 			dim as CWikiConUrl ptr wikicon = Connection_Create( )
 			printlog "Loading '" + *sPage + "'"
-			if( wikicon->LoadPage( sPage, TRUE, TRUE, sBody ) <> FALSE ) then
+			if( wikicon->LoadPage( sPage, sBody ) <> FALSE ) then
 				if( wikicon->GetPageID() > 0 ) then
 					if( len(sBody) > 0 ) then
 						wikicache->SavePage( sPage, sBody )