Changeset 279 for trunk/gsdl/src/recpt
- Timestamp:
- 1999-06-16T16:03:48+12:00 (25 years ago)
- Location:
- trunk/gsdl/src/recpt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/browsetools.cpp
r278 r279 12 12 /* 13 13 $Log$ 14 Revision 1.6 1999/06/16 04:03:47 sjboddie 15 Now sets "cl" arg to "search" when going to a document from a search 16 results page. This allows the close book icon (in hierarchy toc) to 17 take you back to the results page if that's where you came from. 18 If you got to the document page somehow other than from a 19 classification or a search (i.e. if "cl" isn't set) then the close 20 book icon is disabled 21 14 22 Revision 1.5 1999/06/16 03:11:25 sjboddie 15 23 get_info() now takes a getParents argument … … 378 386 text_t doclink = "<a href=\"_httpdocument_&cl="; 379 387 380 if (args["d"].empty()) { 381 if (args["cl"].empty()) return; 382 OID = args["cl"]; 388 text_t &arg_d = args["d"]; 389 text_t &arg_cl = args["cl"]; 390 391 if (arg_d.empty()) { 392 if (arg_cl.empty()) return; 393 OID = arg_cl; 383 394 topOID = OID; // don't always want to expand from top if expanding classifications 384 395 classifytype = "classify"; 385 396 } else { 386 OID = arg s["d"];387 get_top (arg s["d"], topOID);397 OID = arg_d; 398 get_top (arg_d, topOID); 388 399 classifytype = "Document"; 389 400 } … … 454 465 if ((classifytype == "Document") && (is_top((*thissection).OID)) && 455 466 (args.getintarg("x"))) 456 textout << "<a href=\"\" onClick = \"close_detach() ";467 textout << "<a href=\"\" onClick = \"close_detach();\">"; 457 468 else { 458 469 if (!gt) { … … 461 472 if (is_top (thisOID)) 462 473 if (classifytype == "classify") 463 link = args["cl"] + "&d=" + thisOID;474 link = doclink + arg_cl + "&d=" + thisOID + "\">"; 464 475 else 465 link = args["cl"]; 476 if (arg_cl.empty()) 477 link.clear(); 478 else if (arg_cl == "search") 479 link = "<a href=\"_httpquery_\">"; 480 else 481 link = doclink + arg_cl + "\">"; 466 482 else 467 483 if (haschildren) 468 484 if (classifytype == "classify") 469 link = thisOID + ".pr";485 link = doclink + thisOID + ".pr\">"; 470 486 else 471 link = args["cl"] + "&d=" + thisOID + ".pr";487 link = doclink + arg_cl + "&d=" + thisOID + ".pr\">"; 472 488 else 473 489 if (classifytype == "classify") 474 link = thisOID;490 link = doclink + thisOID + "\">"; 475 491 else 476 link = args["cl"] + "&d=" + thisOID;492 link = doclink + arg_cl + "&d=" + thisOID + "\">"; 477 493 478 textout << outconvert << disp << doclink <<link;494 textout << outconvert << disp << link; 479 495 } else { 480 textout << "<a href=\"#" << count ;496 textout << "<a href=\"#" << count << "\">"; 481 497 count ++; 482 498 } 483 499 } 484 500 485 textout << outconvert << disp << "\">" <<icon << "</a></td><td";501 textout << outconvert << disp << icon << "</a></td><td"; 486 502 if (colsremaining > 1) textout << " colspan=" << colsremaining; 487 503 textout << outconvert << disp << ">" << title << "</td></tr>\n"; … … 502 518 FilterResponse_t response; 503 519 text_t doclink = "<a href=\"_httpdocument_"; 520 521 text_t &arg_cl = args["cl"]; 504 522 505 523 metadata.push_back ("doctype"); … … 547 565 } else { 548 566 text_t link; 549 if (doctype == "classify") link = "&cl=" + *thisparent + ".pr";567 if (doctype == "classify") link = doclink + "&cl=" + *thisparent + ".pr"; 550 568 else 551 if (is_top (*thisparent)) link = "&cl=" + args["cl"]; 552 else link = "&cl=" + args["cl"] + "&d=" + *thisparent + ".pr"; 569 if (is_top (*thisparent)) 570 if (arg_cl.empty()) 571 link.clear(); 572 else if (arg_cl == "search") 573 link = "<a href=\"_httpquery_\">"; 574 else 575 link = doclink + "&cl=" + arg_cl + "\">"; 576 else link = doclink + "&cl=" + arg_cl + "&d=" + *thisparent + ".pr\">"; 553 577 554 578 textout << outconvert << disp << "<tr>" << tab << "<td valign=top>" 555 << doclink << link << "\">"<< icon << "</a></td>";579 << link << icon << "</a></td>"; 556 580 } 557 581 textout << "<td"; -
trunk/gsdl/src/recpt/queryaction.cpp
r275 r279 12 12 /* 13 13 $Log$ 14 Revision 1.5 1999/06/16 04:03:48 sjboddie 15 Now sets "cl" arg to "search" when going to a document from a search 16 results page. This allows the close book icon (in hierarchy toc) to 17 take you back to the results page if that's where you came from. 18 If you got to the document page somehow other than from a 19 classification or a search (i.e. if "cl" isn't set) then the close 20 book icon is disabled 21 14 22 Revision 1.4 1999/06/16 02:08:38 sjboddie 15 23 got queryaction working … … 321 329 while (this_doc != end_doc) { 322 330 323 text_t link = "<a href=\"_httpdocument_& d=" + (*this_doc).OID + "\">";331 text_t link = "<a href=\"_httpdocument_&cl=search&d=" + (*this_doc).OID + "\">"; 324 332 325 333 text_t title;
Note:
See TracChangeset
for help on using the changeset viewer.