Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

gigabot advice updates

Browse Source
This commit is contained in:
mwells
2014-09-06 21:05:11 -07:00
parent 7c5ba792d8
commit f21f2a282a
5 changed files with 115 additions and 33 deletions

122
PageAddColl.cpp

@ -77,10 +77,50 @@ bool sendPageAddDelColl ( TcpSocket *s , HttpRequest *r , bool add ) {
return g_httpServer.sendSuccessReply(s,format);
}
// error?
char *action = r->getString("action",NULL);
char *addColl = r->getString("addcoll",NULL);
char buf [ 64*1024 ];
SafeBuf p(buf, 64*1024);
//
// CLOUD SEARCH ENGIEN SUPPORT - GIGABOT ERRORS
//
SafeBuf gtmp;
char *gmsg = NULL;
// is it too big?
if ( action && addColl && gbstrlen(addColl) > MAX_COLL_LEN ) {
gtmp.safePrintf("search engine name is too long");
gmsg = gtmp.getBufStart();
}
// from Collectiondb.cpp::addNewColl() ensure coll name is legit
char *x = addColl;
for ( ; x && *x ; x++ ) {
if ( is_alnum_a(*x) ) continue;
if ( *x == '-' ) continue;
if ( *x == '_' ) continue; // underscore now allowed
break;
}
if ( x && *x ) {
g_errno = EBADENGINEER;
gtmp.safePrintf("<font color=red>Error. \"%s\" is a "
"malformed name because it "
"contains the '%c' character.</font><br><br>",
addColl,*x);
gmsg = gtmp.getBufStart();
}
//
// END GIGABOT ERRORS
//
//
// CLOUD SEARCH ENGINE SUPPORT
//
@ -89,12 +129,11 @@ bool sendPageAddDelColl ( TcpSocket *s , HttpRequest *r , bool add ) {
// crap, this GET request, "r", is missing the "c" parm sometimes.
// we need to use the "addcoll" parm anyway. maybe print a meta
// redirect then?
char *action = r->getString("action",NULL);
char guide = r->getLong("guide",0);
if ( action && ! msg && format == FORMAT_HTML && guide ) {
// do not redirect if gmsg is set, there was a problem with the name
if ( action && ! msg && format == FORMAT_HTML && guide && ! gmsg ) {
//return g_parms.sendPageGeneric ( s, r, PAGE_BASIC_SETTINGS );
// just redirect to it
char *addColl = r->getString("addcoll",NULL);
if ( addColl )
p.safePrintf("<meta http-equiv=Refresh "
"content=\"0; URL=/admin/settings"
@ -107,7 +146,16 @@ bool sendPageAddDelColl ( TcpSocket *s , HttpRequest *r , bool add ) {
// print standard header
g_pages.printAdminTop ( &p , s , r );
g_pages.printAdminTop ( &p , s , r , NULL,
"onload=document."
"getElementById('acbox').focus();");
// gigabot error?
//if ( gmsg )
// p.safePrintf("Gigabot says: %s<br><br>",gmsg);
//long page = g_pages.getDynamicPageNumber ( r );
//char *coll = r->getString ( "c" );
@ -121,7 +169,11 @@ bool sendPageAddDelColl ( TcpSocket *s , HttpRequest *r , bool add ) {
if ( g_errno ) msg = mstrerror(g_errno);
if ( msg ) {
if ( msg && ! guide ) {
char *cc = "deleting";
if ( add ) cc = "adding";
p.safePrintf (
@ -137,36 +189,56 @@ bool sendPageAddDelColl ( TcpSocket *s , HttpRequest *r , bool add ) {
// CLOUD SEARCH ENGINE SUPPORT
//
if ( add && guide )
printGigabotAdvice ( &p , PAGE_ADDCOLL , r );
printGigabotAdvice ( &p , PAGE_ADDCOLL , r , gmsg );
// print the add collection box
if ( add /*&& (! nc[0] || g_errno ) */ ) {
char *t1 = "Add Collection";
if ( guide ) t1 = "Add Search Engine";
p.safePrintf (
"<center>\n<table %s>\n"
"<tr class=hdrow><td colspan=2>"
"<center><b>Add Collection</b></center>"
"</td></tr>\n",
TABLE_STYLE);
p.safePrintf (
"<tr bgcolor=#%s>"
"<td><b>name of new collection to add</td>\n"
"<td><input type=text name=addcoll size=30>"
"<center><b>%s</b></center>"
"</td></tr>\n"
"<tr bgcolor=#%s>"
"<td><b>clone settings from this collection</b>"
"<br><font size=1>Copy settings from this "
"pre-existing collection. Leave blank to "
"accept default values.</font></td>\n"
"<td><input type=text name=clonecoll size=30>"
"</td>"
"</tr>"
, LIGHT_BLUE
, LIGHT_BLUE
,TABLE_STYLE
,t1
);
char *t2 = "collection";
if ( guide ) t2 = "search engine";
char *str = addColl;
if ( ! addColl ) str = "";
p.safePrintf (
"<tr bgcolor=#%s>"
"<td><b>name of new %s to add</td>\n"
"<td><input type=text name=addcoll size=30 "
"id=acbox "
"value=\"%s\">"
"</td></tr>\n"
, LIGHT_BLUE
, t2
, str
);
// don't show the clone box if we are under gigabot the guide
if ( ! guide )
p.safePrintf(
"<tr bgcolor=#%s>"
"<td><b>clone settings from this "
"collection</b>"
"<br><font size=1>Copy settings from "
"this pre-existing collection. Leave "
"blank to "
"accept default values.</font></td>\n"
"<td><input type=text name=clonecoll "
"size=30>"
"</td>"
"</tr>"
, LIGHT_BLUE
);
// now list collections from which to copy the config
//p.safePrintf (
// "<tr><td><b>copy configuration from this "

2
PageBasic.cpp

@ -1340,7 +1340,7 @@ bool sendPageWidgets ( TcpSocket *socket , HttpRequest *hr ) {
//char format = hr->getReplyFormat();
//if ( format == FORMAT_HTML )
printGigabotAdvice ( &sb , PAGE_BASIC_STATUS , hr );
printGigabotAdvice ( &sb , PAGE_BASIC_STATUS , hr , NULL );
printScrollingWidget ( &sb , cr );

4
PageRoot.cpp

@ -1257,7 +1257,7 @@ bool printWebHomePage ( SafeBuf &sb , HttpRequest *r , TcpSocket *sock ) {
sb.safePrintf("<br>");
/*
sb.safePrintf("<div class=grad style=\"border-radius:200px;border-color:blue;border-style:solid;border-width:3px;padding:12px;width:320px;height:320px;display:inline-block;z-index:100;color:black;position:relative;background-color:lightgray;\">");
sb.safePrintf("<br>");
@ -1349,7 +1349,7 @@ bool printWebHomePage ( SafeBuf &sb , HttpRequest *r , TcpSocket *sock ) {
sb.safePrintf("</div>");
sb.safePrintf("</div>");
*/
//sb.safePrintf("</TD></TR></TABLE></body></html>");

17
Pages.cpp

@ -1459,7 +1459,7 @@ bool Pages::printAdminTop (SafeBuf *sb ,
// gigabot helper blurb
printGigabotAdvice ( sb , page , r );
printGigabotAdvice ( sb , page , r , NULL );
// begin 2nd row in big table
//sb->safePrintf("</td></TR>");
@ -1468,7 +1468,10 @@ bool Pages::printAdminTop (SafeBuf *sb ,
return true;
}
bool printGigabotAdvice ( SafeBuf *sb , long page , HttpRequest *hr ) {
bool printGigabotAdvice ( SafeBuf *sb ,
long page ,
HttpRequest *hr ,
char *errMsg ) {
char format = hr->getFormat();
if ( format != FORMAT_HTML ) return true;
@ -1521,7 +1524,8 @@ bool printGigabotAdvice ( SafeBuf *sb , long page , HttpRequest *hr ) {
//"<br><br>"
"Enter the name of your collection "
"(search engine) in the box below then hit "
"submit."
"submit. You can only use alphanumeric characters, "
"hyphens or underscores."
"<br>"
"<br>"
"Remember this name so you can access the controls "
@ -1570,7 +1574,12 @@ bool printGigabotAdvice ( SafeBuf *sb , long page , HttpRequest *hr ) {
"height=141px width=75px src=/robot3.png>"
"</td><td>"
"<b>"
"%s"
);
if ( errMsg )
sb->safePrintf("%s",errMsg);
sb->safePrintf("%s"
"</b>"
, advice
);

3
Pages.h

@ -34,7 +34,8 @@ bool sendPageBasicSettings ( TcpSocket *s , HttpRequest *r );
bool sendPageBasicStatus ( TcpSocket *s , HttpRequest *r );
//bool sendPageBasicDiffbot ( TcpSocket *s , HttpRequest *r );
bool printGigabotAdvice ( SafeBuf *sb , long page , HttpRequest *hr ) ;
bool printGigabotAdvice ( SafeBuf *sb , long page , HttpRequest *hr ,
char *gerrmsg ) ;
bool sendPageRoot ( TcpSocket *s , HttpRequest *r );
bool sendPageRoot ( TcpSocket *s , HttpRequest *r, char *cookie );