fbdoc: getpage can use CWikiConSql

Author: jayrm

doc/fbchkdoc/getindex.bas

@@ -22,7 +22,10 @@
 '' fbdoc headers
 #include once "CWikiConUrl.bi"
 #include once "CWikiConDir.bi"
+
+#if defined(HAVE_MYSQL)
 #include once "CWikiConSql.bi"
+#endif
 
 '' fbchkdoc headers
 #include once "fbchkdoc.bi"
@@ -113,7 +116,7 @@ sPage = "PageIndex"
 
 dim as CWikiCon ptr wikicon = NULL
 
-'' connect to the wiki and get PageIndex as HTML
+'' connect to the wiki and get PageIndex (list of all pages)
 
 if( bLocal ) then
 
@@ -146,7 +149,6 @@ elseif( bUseSql ) then
 
 #endif
 else
-
 	cmd_opts_check_url()
 
 	if( len( app_opt.wiki_url ) = 0 ) then

doc/fbchkdoc/getpage.bas

@@ -24,6 +24,10 @@
 #include once "fbdoc_loader.bi"
 #include once "fbdoc_loader_web.bi"
 
+#if defined(HAVE_MYSQL)
+#include once "CWikiConSql.bi"
+#endif
+
 '' fbchkdoc headers
 #include once "fbchkdoc.bi"
 #include once "funcs.bi"
@@ -42,9 +46,14 @@ using fbdoc
 
 '' private options
 dim allow_retry as boolean = true
+dim as boolean bUseSql = false '' -usesql given on command line
 
 '' enable url and cache
+#if defined(HAVE_MYSQL)
+cmd_opts_init( CMD_OPTS_ENABLE_URL or CMD_OPTS_ENABLE_CACHE or CMD_OPTS_ENABLE_PAGELIST or CMD_OPTS_ENABLE_DATABASE )
+#else
 cmd_opts_init( CMD_OPTS_ENABLE_URL or CMD_OPTS_ENABLE_CACHE or CMD_OPTS_ENABLE_PAGELIST )
+#endif
 
 dim i as integer = 1
 while( command(i) > "" )
@@ -54,6 +63,10 @@ while( command(i) > "" )
 		select case lcase(command(i))
 		case "-auto"
 			allow_retry = false
+#if defined(HAVE_MYSQL)
+		case "-usesql"
+			bUseSql = true
+#endif
 		case else
 			cmd_opts_unrecognized_die( i )
 		end select
@@ -73,14 +86,23 @@ if( app_opt.help ) then
 	print "   -dev+            get pages from the development server in to dev_cache_dir"
 	print
 	cmd_opts_show_help( "get page from", false )
+#if defined(HAVE_MYSQL)
+	print "   -usesql          use MySQL connection to read index"
+#endif
 	print
 	end 1
 end if
 
 cmd_opts_resolve()
 cmd_opts_check_cache()
 cmd_opts_check_url()
-
+if( len( app_opt.wiki_url ) = 0 ) then
+	print "wiki_url not set. use -url, -web, -web+, -dev, or -dev+"
+	end 1
+end if
+if( bUseSql ) then
+	cmd_opts_check_database()
+end if
 
 '' no pages? nothing to do...
 if( app_opt.pageCount = 0 ) then
@@ -96,35 +118,68 @@ redim failedpages(1 to 1) as string
 '' main loop - has option to retry/list failed pages
 do
 
+	dim as CWikiCon ptr wikicon = NULL
+
 	'' Initialize the cache
 	if LocalCache_Create( app_opt.cache_dir, CWikiCache.CACHE_REFRESH_ALL ) = FALSE then
 		print "Unable to use local cache dir " + app_opt.cache_dir
 		end 1
 	end if
 
-	'' Initialize the wiki connection
-	Connection_SetUrl( app_opt.wiki_url, app_opt.ca_file )
-
-	print "URL: "; app_opt.wiki_url
-	if( app_opt.ca_file > "" ) then
-		print "Certificate: "; app_opt.ca_file
+	if( bUseSql ) then
+#if defined(HAVE_MYSQL)
+		cmd_opts_check_database()
+
+		wikicon = new CWikiConSql( app_opt.db_host, app_opt.db_user, app_opt.db_pass, app_opt.db_name, app_opt.db_port )
+		if wikicon = NULL then
+			print "Unable to create connection " + app_opt.cache_dir
+			end 1
+		end if
+
+		dim as CWikiConSql ptr o = cast( CWikiConSql ptr, wikicon )
+		if( o->Connect() = FALSE ) then
+			print "Error"
+			end 1
+		end if
+#endif
 	else
-		print "Certificate: none"
+		print "URL: "; app_opt.wiki_url
+
+		wikicon = new CWikiConUrl( app_opt.wiki_url, app_opt.ca_file )
+		if wikicon = NULL then
+			print "Unable to create connection " + app_opt.wiki_url
+			end 1
+		end if
+
+		if( app_opt.ca_file > "" ) then
+			print "Certificate: "; app_opt.ca_file
+		else
+			print "Certificate: none"
+		end if
+
+		print "cache: "; app_opt.cache_dir
 	end if
-	print "cache: "; app_opt.cache_dir
 
 	nfailedpages = 0
 
 	if( app_opt.pageCount > 0 ) then
 		dim as integer i, j
 		dim as string ret
 		for i = 1 to app_opt.pageCount
-			ret = LoadPage( app_opt.pageList(i), FALSE, TRUE )
-			if( ret = "" ) then
+			dim sBody as string = ""
+			print "Loading '" + app_opt.pageList(i) + "'"
+			if( wikicon->LoadPage( app_opt.pageList(i), sBody ) = FALSE ) then
 				print "Failed to load '" & app_opt.pageList(i) & "'"
 				nfailedpages += 1
 				redim preserve failedpages( 1 to nfailedpages )
 				failedpages(nfailedpages) = app_opt.pageList(i)
+			else
+				if( wikicon->GetPageID() > 0 ) then
+					if( len(sBody) > 0 ) then
+						dim as CWikiCache ptr wikicache = LocalCache_Get()
+						wikicache->SavePage( app_opt.pageList(i), sBody )
+					end if
+				end if
 			end if
 
 			if( inkey = chr(27) ) then
@@ -142,7 +197,8 @@ do
 		next
 	end if
 
-	Connection_Destroy()
+	delete wikicon
+
 	LocalCache_Destroy()
 
 	'' Check for failed pages

doc/libfbdoc/CWikiConSql.bas

@@ -289,7 +289,7 @@ namespace fb.fbdoc
 				return FALSE
 			end if
 
-			sql = "SELECT tag, body FROM wikka_pages WHERE ( latest = 'Y' AND tag = '" & *pagename & "' )"
+			sql = "SELECT id, tag, CAST(CONVERT(body USING utf8) AS binary) FROM wikka_pages WHERE ( latest = 'Y' AND tag = '" & *pagename & "' )"
 
 			if( 0 <> mysql_real_query( ctx->db_conn->db, sql, len(sql)) ) then
 				return FALSE
@@ -305,7 +305,8 @@ namespace fb.fbdoc
 				return FALSE
 			end if
 
-			body = *row[1]
+			ctx->pageid = cint( *row[0] )
+			body = *row[2]
 
 			mysql_free_result( res )
 

doc/libfbdoc/CWikiConUrl.bas

@@ -549,7 +549,7 @@ namespace fb.fbdoc
 
 		ctx->pageid = get_pageid( ctx )
 
-		function = TRUE
+		function = cbool( ctx->pageid > 0 )
 
 	end function
 
@@ -585,14 +585,13 @@ namespace fb.fbdoc
 			remove_http_headers( body )
 			remove_html_tags( body )
 			extract_page_names( body )
+			function = TRUE
 		end if
 
 		delete stream
 
 		ctx->pageid = -1
 
-		function = TRUE
-
 	end function
 
 	'':::::

doc/libfbdoc/fbdoc_loader_sql.bas

@@ -72,7 +72,7 @@ namespace fb.fbdoc
 			return FALSE
 		end if
 
-		sql = "SELECT tag, body FROM wikka_pages WHERE ( latest = 'Y' )"
+		sql = "SELECT tag, CAST(CONVERT(body USING utf8) AS binary) FROM wikka_pages WHERE ( latest = 'Y' )"
 
 		if( 0 <> mysql_real_query( @db, sql, len(sql)) ) then
 			printlog "Unable to query wikka_pages"