Changeset 124


Ignore:
Timestamp:
1999-01-22T10:20:15+13:00 (25 years ago)
Author:
sjboddie
Message:

removed unused collection parameter from several functions

Location:
trunk/gsdl/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/colservr/gdbmclass.cpp

    r114 r124  
    1212/*
    1313   $Log$
     14   Revision 1.4  1999/01/21 21:20:08  sjboddie
     15   removed unused collection parameter from several functions
     16
    1417   Revision 1.3  1999/01/19 01:38:15  rjmcnab
    1518
    … …  
    357360// book from the gdbm
    358361// if booksection doesn't exist it remains blank
    359 void seperate_parts(const text_t &targetdoc, gdbmclass &gdbm, const text_t &collection,
     362void separate_parts(const text_t &targetdoc, gdbmclass &gdbm,
    360363            text_t &classification, text_t &booksection) {
    361364 
    … …  
    450453// classification or booksection
    451454void get_siblings (const text_t &classification, const text_t &booksection,
    452            gdbmclass &gdbm, const text_t &collection,
    453            vector<text_t> &siblings) {
     455           gdbmclass &gdbm, vector<text_t> &siblings) {
    454456 
    455457  gdbm_info info;

  • trunk/gsdl/src/colservr/gdbmclass.h

    r112 r124  
    8282void remove_tags (text_t &text);
    8383
    84 void seperate_parts (const text_t &targetdoc, gdbmclass &gdbm, const text_t &collection,
     84void separate_parts (const text_t &targetdoc, gdbmclass &gdbm,
    8585             text_t &classification, text_t &booksection);
    8686void split_targetdoc (const text_t &targetdoc, text_t &classification,
    … …  
    8989void get_parents (const text_t &targetdoc, vector<text_t> &parents);
    9090void get_siblings (const text_t &classification, const text_t &booksection,
    91            gdbmclass &gdbm, const text_t &collection,
    92            vector<text_t> &siblings);
     91           gdbmclass &gdbm, vector<text_t> &siblings);
    9392int are_same_chapter(text_t section1, text_t section2);
    9493void get_first_section(const text_t &instring, text_t &returnstring);

  • trunk/gsdl/src/library/browse.cpp

    r112 r124  
    1212/*
    1313   $Log$
     14   Revision 1.8  1999/01/21 21:20:10  sjboddie
     15   removed unused collection parameter from several functions
     16
    1417   Revision 1.7  1999/01/12 01:51:03  rjmcnab
    1518
    … …  
    4649// get_list_toc returns all the titles of the sections in secarray as a list of links
    4750// (i.e. as used by howto classifications in hdl collection)
    48 void browseclass::get_list_toc (vector<text_t> &secarray, text_t &collection,
    49                 gdbmclass &gdbm, text_t &return_text) {
     51void browseclass::get_list_toc (vector<text_t> &secarray, gdbmclass &gdbm, text_t &return_text) {
    5052  gdbm_info info;
    5153  text_t section, child;
    … …  
    9294   
    9395    // get links to previous and next sections.
    94     get_prev_next_links(booksection, args["c"], previous, next);
     96    get_prev_next_links(booksection, previous, next);
    9597   
    9698    return_text += "<p>\n<table cellpadding=\"0\" cellspacing=\"0\">\n";
    … …  
    147149 
    148150  get_parents (fulldoc, parents);
    149   get_siblings (classification, booksection, gdbm, args["c"], siblings);
     151  get_siblings (classification, booksection, gdbm, siblings);
    150152 
    151153  // remove everything above top level of book from parents
    … …  
    196198  text_t book_top;
    197199  get_book_top (booksection, book_top);
    198   get_contents (book_top, gdbm, args["c"], contents, totalcols);
     200  get_contents (book_top, gdbm, contents, totalcols);
    199201 
    200202  vector<text_t>::const_iterator section = contents.begin();
    … …  
    428430void browseclass::get_alphabet_links (const text_t &classification,
    429431                      const text_t &booksection, gdbmclass &gdbm,
    430                       const text_t &collection, text_t &return_text) {
     432                      text_t &return_text) {
    431433 
    432434  gdbm_info info;
    … …  
    472474// section at current level then there'll be no arrow.
    473475void browseclass::get_arrows(text_t &docref, gdbmclass &gdbm,
    474                  const text_t &collection, text_t &arrows) {
     476                 text_t &arrows) {
    475477  text_t previous, next, firstcontent;
    476478  gdbm_info info;
    … …  
    481483
    482484  // get links to previous and next sections.
    483   get_prev_next_links(docref, collection, previous, next);
     485  get_prev_next_links(docref, previous, next);
    484486
    485487  // get html for previous link if it exists
    … …  
    513515// defined in the infodb so calling function should check.
    514516
    515 void browseclass::get_prev_next_links (text_t docref, const text_t &collection,
    516                        text_t &previous, text_t &next) {
     517void browseclass::get_prev_next_links (text_t docref, text_t &previous, text_t &next) {
    517518  int prevnum, nextnum, thisnum;
    518519  text_t section;
    … …  
    533534// a table of contents using contents
    534535void browseclass::get_contents (text_t expandlevel1, gdbmclass &gdbm,
    535                 const text_t &collection, vector<text_t> &contents,
    536                 int &totalcols) {
     536                vector<text_t> &contents, int &totalcols) {
    537537
    538538  text_t expandlevel = expandlevel1;
    … …  
    591591  gdbm_info info;
    592592 
    593   seperate_parts(args["d"], gdbm, args["c"], classification, booksection);
     593  separate_parts(args["d"], gdbm, classification, booksection);
    594594 
    595595  // don't want links at top levels
    … …  
    601601  return_text += "<tr><td align=left>\n";
    602602 
    603   get_siblings (classification, booksection, gdbm, args["c"], siblings);
     603  get_siblings (classification, booksection, gdbm, siblings);
    604604 
    605605  // get older and younger siblings if they exist
    … …  
    747747// in the book mentioned in targetdoc
    748748
    749 void browseclass::get_contents_arr(cgiargsclass &args, gdbmclass &gdbm,
     749void browseclass::get_contents_arr(const text_t &targetdoc, gdbmclass &gdbm,
    750750                   vector<text_t> &contents_arr) {
    751751  text_t booksection;
    752752  int totalcols = 0;
    753   get_book(args["d"], booksection);
    754   get_contents (booksection, gdbm, args["c"], contents_arr, totalcols);
     753  get_book(targetdoc, booksection);
     754  get_contents (booksection, gdbm, contents_arr, totalcols);
    755755}
    756756
    … …  
    758758// sorts an array of sections alphabetically (i.e. by title, author depending
    759759// on what classification is) or by date
    760 void browseclass::sort_array (vector<text_t> &array, gdbmclass &gdbm,
    761                   const text_t &collection, const text_t classification) {
     760void browseclass::sort_array (vector<text_t> &array, gdbmclass &gdbm, const text_t classification) {
    762761
    763762  if ((classification[0] != 'T') && (classification[0] != 'A') &&

  • trunk/gsdl/src/library/browse.h

    r121 r124  
    3131                   text_t &/*return_text*/) {}
    3232  virtual void get_links(cgiargsclass &args, gdbmclass &gdbm, text_t &return_text);
    33   virtual void get_contents_arr(cgiargsclass &args, gdbmclass &gdbm, vector<text_t> &contents_arr);
     33  virtual void get_contents_arr(const text_t &targetdoc, gdbmclass &gdbm, vector<text_t> &contents_arr);
    3434
    3535protected:
    3636
    37   virtual void get_list_toc (vector<text_t> &secarray, text_t &collection,
    38                  gdbmclass &gdbm, text_t &return_text);
     37  virtual void get_list_toc (vector<text_t> &secarray, gdbmclass &gdbm, text_t &return_text);
    3938  virtual void get_page_toc (cgiargsclass &args, const text_t &booksection,
    4039                 const text_t &classification, const text_t &class_string,
    … …  
    5554  virtual void get_alphabet_links (const text_t &classification,
    5655                   const text_t &booksection, gdbmclass &gdbm,
    57                    const text_t &collection, text_t &return_text);
     56                   text_t &return_text);
    5857  virtual void get_arrows(text_t &docref, gdbmclass &gdbm,
    59               const text_t &collection, text_t &arrows);
    60   virtual void get_prev_next_links (text_t docref, const text_t &collection,
    61                     text_t &previous, text_t &next);
     58              text_t &arrows);
     59  virtual void get_prev_next_links (text_t docref, text_t &previous, text_t &next);
    6260  virtual void get_contents (text_t expandlevel1, gdbmclass &gdbm,
    63                  const text_t &collection, vector<text_t> &contents,
    64                  int &totalcols);
    65   virtual void sort_array (vector<text_t> &array, gdbmclass &gdbm,
    66                const text_t &collection, const text_t classification);
     61                 vector<text_t> &contents, int &totalcols);
     62  virtual void sort_array (vector<text_t> &array, gdbmclass &gdbm, const text_t classification);
    6763};
    6864

  • trunk/gsdl/src/library/libinterface.cpp

    r119 r124  
    1212/*
    1313   $Log$
     14   Revision 1.13  1999/01/21 21:20:15  sjboddie
     15   removed unused collection parameter from several functions
     16
    1417   Revision 1.12  1999/01/19 08:34:57  rjmcnab
    1518
    … …  
    972975    levelcount = count_dots(booksection);
    973976
    974     browse->get_contents_arr(args, gdbm, contents_arr);
    975    
     977    browse->get_contents_arr(args["d"], gdbm, contents_arr);
    976978
    977979    // get text for each section of book
Note: See TracChangeset for help on using the changeset viewer.