Changeset 1419 for trunk

Timestamp:

2000-08-17T17:07:43+12:00 (24 years ago)

Author:

sjboddie

Message:

Added collector action - also changed the javascript required by all the
rollover buttons

Location:

trunk/gsdl

Files:

• images/gcbildof.gif (added)
• images/gcbildon.gif (added)
• images/gcconfof.gif (added)
• images/gcconfon.gif (added)
• images/gcinfoof.gif (added)
• images/gcinfoon.gif (added)
• images/gcsrceof.gif (added)
• images/gcsrceon.gif (added)
• images/gcviewof.gif (added)
• images/gcviewon.gif (added)
• images/grarrow.gif (added)
• images/guarrow.gif (added)
• images/h_colect.gif (added)
• images/ncbildof.gif (added)
• images/ncconfof.gif (added)
• images/ncinfoof.gif (added)
• images/ncsrceof.gif (added)
• images/ncviewof.gif (added)
• images/ycbildof.gif (added)
• images/ycbildon.gif (added)
• images/ycconfof.gif (added)
• images/ycconfon.gif (added)
• images/ycinfoof.gif (added)
• images/ycinfoon.gif (added)
• images/ycsrceof.gif (added)
• images/ycsrceon.gif (added)
• images/ycviewof.gif (added)
• images/ycviewon.gif (added)
• lib/fileutil.cpp (modified) (3 diffs)
• lib/fileutil.h (modified) (1 diff)
• macros/base.dm (modified) (5 diffs)
• macros/collect.dm (added)
• macros/document.dm (modified) (3 diffs)
• macros/style.dm (modified) (1 diff)
• src/recpt/Makefile.in (modified) (3 diffs)
• src/recpt/collectoraction.cpp (added)
• src/recpt/collectoraction.h (added)
• src/recpt/documentaction.cpp (modified) (9 diffs)
• src/recpt/documentaction.h (modified) (1 diff)
• src/recpt/librarymain.cpp (modified) (2 diffs)

trunk/gsdl/lib/fileutil.cpp

@@ -147 +147 @@
 #include <windows.h>
 
-bool read_dir (const text_t &dirname, text_tarray &filelist) {
+bool directory_exists (const text_t &dirname) {
   
   WIN32_FIND_DATA FileData;  
@@ -155 +155 @@
   
   hSearch = FindFirstFile(dirpath, &FileData); 
-  if (hSearch == INVALID_HANDLE_VALUE) return false;
+  delete dirpath;
+
+  if (hSearch == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+  return true;
+}
+
+bool read_dir (const text_t &dirname, text_tarray &filelist) {
+  
+  WIN32_FIND_DATA FileData;  
+  HANDLE hSearch; 
+  char *dirpath = dirname.getcstr();
+  strcat (dirpath, "\\*");
+  
+  hSearch = FindFirstFile(dirpath, &FileData); 
+  delete dirpath;
+
+  if (hSearch == INVALID_HANDLE_VALUE) {
+    return false;
+  }
   
   text_t filename = FileData.cFileName;
@@ -176 +196 @@
 
 #include <dirent.h>
+
+bool directory_exists (const text_t &dirname) {
+
+  char *tmp = dirname.getcstr();
+  DIR *dirin = opendir (tmp);
+  delete tmp;
+  
+  if (dirin == NULL) return false;
+  closedir (dirin);
+  return true;
+}
 
 bool read_dir (const text_t &dirname, text_tarray &filelist) {

trunk/gsdl/lib/fileutil.h

@@ -44 +44 @@
 bool file_writable (const text_t &filename);
 
+// returns true if directory exists
+bool directory_exists (const text_t &dirname);
+
 bool read_dir (const text_t &dirname, text_tarray &filelist);
 

trunk/gsdl/macros/base.dm

@@ -71 +71 @@
 
 _navigationbar_ {}
-_javaimagesnavbar_ {}
-_javaimagescontent_ {}
 _widthtspace_ {2}
 
@@ -86 +84 @@
 #granularity selection for mgpp
 _gselection_ {}
+
+#######################################################################
+# flashy rollover image macro
+#
+#######################################################################
+
+# imagescript should always be included in html header if there are
+# flashy images on the page
+_imagescript_ {
+var loaded = new Array();
+function gbutton (image, onimage) \{
+  if (image && image.src && (image.out == null || typeof(image.out) == typeof(void(0)))) \{
+    s = image.src;
+    image.out = new Image();
+    image.out.src = s;
+    image.over = new Image();
+    image.over.src = onimage;
+    loaded[image.name] = image;
+  \}
+\}
+
+function roll (imagename, over) \{
+  if (document.images) \{
+    if (over) i = "over";
+    else i = "out";
+    image = loaded[imagename];
+    if (image) image.src = eval("image."+i+".src");
+  \}
+\}
+}
+
+# gsimage should be used to define an instance of a flashy image
+# parameters are:
+# 1. the url to go to when the button is clicked
+# 2. the url of the "off" image
+# 3. the url of the "on" image
+# 4. the name of the image (must be unique)
+# 5. image alt text
+_gsimage_ {<a href="_1_" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);"><img
+name="_4_" src="_2_" onLoad="gbutton(this,'_3_');" border=0 alt="_5_"></a>}
+
+_gsimage_ [v=1] {<a href="_1_">_5_</a><br>}
+
 #######################################################################
 # navigation bar images
@@ -99 +140 @@
 # image macros for all the classifications currently supported by
 # this receptionist.
-#
-# image macros for to and from added by gwp on 2000 june 13
-
-_imagesearch_ {<a href="_httpquery_" 
-    onMouseover = "img\_on('search')"
-    onMouseout = "img\_off('search')"><img name="search"
-        src="_httpicontsrchof_" width="_widthtsrchx_" height="_heighttsrchx_" 
-        border="0" alt="_textimagesearch_"></a>}
-_imagesearch_[v=1] {<a href="_httpquery_">_textimagesearch_</a><br>
-}
-
-_imageTitle_ {<a href="_httpbrowseTitle_"
-    onMouseover = "img\_on('titles')" 
-    onMouseout = "img\_off('titles')"><img name="titles" 
-        src="_httpiconttitlof_" width=_widthttitlx_ height=_heightttitlx_ 
-        border=0 alt="_textimageTitle_"></a>}
-_imageTitle_[v=1] {<a href="_httpbrowseTitle_">_textimageTitle_</a><br>
-}
-
-_imageCreator_ {<a href="_httpbrowseCreator_"
-    onMouseover = "img\_on('authors')" 
-    onMouseout = "img\_off('authors')"><img name="authors" 
-        src="_httpicontauthof_" width=_widthtauthx_ height=_heighttauthx_ 
-        border=0 alt="_textimageCreator_"></a>}
-_imageCreator_[v=1] {<a href="_httpbrowseCreator_">_textimageCreator_</a><br>
-}
-
-_imageSeries_ {<a href="_httpbrowseSeries_"
-    onMouseover = "img\_on('series')" 
-    onMouseout = "img\_off('series')"><img name="series" 
-        src="_httpicontserof_" width="_widthtserx_" height="_heighttserx_" 
-        border="0" alt="_textimageSeries_"></a>}
-_imageSeries_[v=1] {<a href="_httpbrowseSeries_">_textimageSeries_</a><br>
-}
-
-_imageDate_ {<a href="_httpbrowseDate_"
-    onMouseover = "img\_on('dates')" 
-    onMouseout = "img\_off('dates')"><img name="dates" 
-        src="_httpicontdateof_" width="_widthtdatex_" height="_heighttdatex_" 
-        border="0" alt="_textimageDate_"></a>}
-_imageDate_[v=1] {<a href="_httpbrowseDate_">_textimageDate_</a><br>
-}
-
-_imageSubject_ {<a href="_httpbrowseSubject_"
-    onMouseover = "img\_on('subjects')" 
-    onMouseout = "img\_off('subjects')"><img name="subjects" 
-        src="_httpicontsubjof_" width="_widthtsubjx_" height="_heighttsubjx_" 
-        border="0" alt="_textimageSubject_"></a>}
-_imageSubject_[v=1] {<a href="_httpbrowseSubject_">_textimageSubject_</a><br>
-}
-
-_imageTo_ {<a href="_httpbrowseTo_"
-    onMouseover = "img\_on('to')" 
-    onMouseout = "img\_off('to')"><img name="to" 
-        src="_httpiconttoof_" width="_widthttox_" height="_heightttox_" 
-        border="0" alt="_textimageTo_"></a>}
-_imageTo_[v=1] {<a href="_httpbrowseTo_">_textimageTo_</a><br>
-}
-
-_imageFrom_ {<a href="_httpbrowseFrom_"
-    onMouseover = "img\_on('from')" 
-    onMouseout = "img\_off('from')"><img name="from" 
-        src="_httpicontfromof_" width="_widthtfromx_" height="_heighttfromx_" 
-        border="0" alt="_textimageFrom_"></a>}
-_imageFrom_[v=1] {<a href="_httpbrowseFrom_">_textimageFrom_</a><br>
-}
-
-_imageOrganization_ {<a href="_httpbrowseOrganization_"
-    onMouseover = "img\_on('org')" 
-    onMouseout = "img\_off('org')"><img name="org" 
-        src="_httpicontorgof_" width="_widthtorgx_" height="_heighttorgx_" 
-        border="0" alt="_textimageOrganization_"></a>}
-_imageOrganization_[v=1] {<a href="_httpbrowseOrganization_">_textimageOrganization_</a><br>
-}
-
-_imageHowto_ {<a href="_httpbrowseHowto_"
-    onMouseover = "img\_on('how')" 
-    onMouseout = "img\_off('how')"><img name="how" 
-        src="_httpiconthowof_" width="_widththowx_" height="_heightthowx_" 
-        border="0" alt="_textimageHowto_"></a>}
-_imageHowto_[v=1] {<a href="_httpbrowseHowto_">_textimageHowto_</a><br>
-}
-
-_imageTopic_ {<a href="_httpbrowseTopic_"
-    onMouseover = "img\_on('topic')" 
-    onMouseout = "img\_off('topic')"><img name="topic" 
-        src="_httpiconttopicof_" width="_widthttopicx_" height="_heightttopicx_" 
-        border="0" alt="_textimageTopic_"></a>}
-_imageTopic_[v=1] {<a href="_httpbrowseTopic_">_textimageTopic_</a><br>
-}
-
-_imageBrowse_ {<a href="_httpbrowseBrowse_"
-    onMouseover = "img\_on('browse')" 
-    onMouseout = "img\_off('browse')"><img name="browse" 
-        src="_httpicontbrwseof_" width="_widthtbrwsex_" height="_heighttbrwsex_" 
-        border="0" alt="_textimageBrowse_"></a>}
-_imageBrowse_[v=1] {<a href="_httpbrowseBrowse_">_textimageBrowse_</a><br>
-}
-
-_imagePeople_ {<a href="_httpbrowsePeople_"
-    onMouseover = "img\_on('People')"
-    onMouseout = "img\_off('People')"><img name="People"
-        src="_httpicontpeopof_" width=_widthtpeopx_ height=_heighttpeopx_
-        border=0 alt="_textimagePeople_"></a>}
-_imagePeople_[v=1] {<a href="_httpbrowsePeople_">_textimagePeople_</a><br>
-}
-
-_imageLanguage_ {<a href="_httpbrowseLanguage_"
-    onMouseover = "img\_on('Language')"
-    onMouseout = "img\_off('Language')"><img name="Language"
-        src="_httpicontlangof_" width=_widthtlangx_ height=_heighttlangx_
-        border=0 alt="_textimageLanguage_"></a>}
-_imageLanguage_[v=1] {<a href="_httpbrowseLanguage_">_textimageLanguage_</a><br>
-}
-
-_imageAcronym_ {<a href="_httpbrowseAcronym_"
-    onMouseover = "img\_on('Acronym')"
-    onMouseout = "img\_off('Acronym')"><img name="Acronym"
-        src="_httpicontacroof_" width=_widthtacrox_ height=_heighttacrox_
-        border=0 alt="_textimageAcronym_"></a>}
-_imageAcronym_[v=1] {<a href="_httpbrowseAcronym_">_textimageAcronym_</a><br>
-}
+
+_imagesearch_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_textimagesearch_)}
+_imageTitle_ {_gsimage_(_httpbrowseTitle_,_httpiconttitlof_,_httpiconttitlon_,titles,_textimageTitle_)}
+_imageCreator_ {_gsimage_(_httpbrowseCreator_,_httpicontauthof_,_httpicontauthon_,authors,_textimageCreator_)}
+_imageSeries_ {_gsimage_(_httpbrowseSeries_,_httpicontserof_,_httpicontseron_,series,_textimageSeries_)}
+_imageDate_ {_gsimage_(_httpbrowseDate_,_httpicontdateof_,_httpicontdateon_,dates,_textimageDate_)}
+_imageSubject_ {_gsimage_(_httpbrowseSubject_,_httpicontsubjof_,_httpicontsubjon_,subjects,_textimageSubject_)}
+_imageTo_ {_gsimage_(_httpbrowseTo_,_httpiconttoof_,_httpiconttoon_,to,_textimageTo_)}
+_imageFrom_ {_gsimage_(_httpbrowseFrom_,_httpicontfromof_,_httpicontfromon_,from,_textimageFrom_)}
+_imageOrganization_ {_gsimage_(_httpbrowseOrganization_,_httpicontorgof_,_httpicontorgon_,org,_textimageOrganization_)}
+_imageHowto_ {_gsimage_(_httpbrowseHowto_,_httpiconthowof_,_httpiconthowon_,how,_textimageHowto_)}
+_imageTopic_ {_gsimage_(_httpbrowseTopic_,_httpiconttopicof_,_httpiconttopicon_,topic,_textimageTopic_)}
+_imageBrowse_ {_gsimage_(_httpbrowseBrowse_,_httpicontbrwseof_,_httpicontbrwseon_,browse,_textimageBrowse_)}
+_imagePeople_ {_gsimage_(_httpbrowsePeople_,_httpicontpeopof_,_httpicontpeopon_,people,_textimagePeople_)}
+_imageLanguage_ {_gsimage_(_httpbrowseLanguage_,_httpicontlangof_,_httpicontlangon_,language,_textimageLanguage_)}
+_imageAcronym_ {_gsimage_(_httpbrowseAcronym_,_httpicontacroof_,_httpicontacroon_,acronym,_textimageAcronym_)}
 
 
@@ -235 +170 @@
 _imagehelp_<br>
 _imagepref_<br>
-}
-
-# the javaimages macros contain the javascript code required
-# by each flashy javascript image. _javaimagesheader_ contains those
-# images at the top right of the page, _javaimagesnavbar_ (set
-# from within the server) contains those images in the navigation bar,
-# and _javaimagescontent_ (also set in server) contains any other 
-# javascript images that occur in the page. 
-# the javaimages macros should contain _javaX_ macros for each javascript
-# image link within the page.
-
-_javaimagesheader_ {_javahome__javahelp__javapref_}
-_javaimagesheader_ [v=1] {}
-
-_javaabout_ {
-    about\_on = new Image(_widthcabtx_, _heightcabtx_);
-    about\_on.src = "_httpiconcabton_";
-    about\_off = new Image(_widthcabtx_, _heightcabtx_);
-    about\_off.src = "_httpiconcabtof_";
-}
-
-_javahome_ {
-    home\_on = new Image(_widthchomex_, _heightchomex_);          
-    home\_on.src = "_httpiconchomeon_";             
-    home\_off = new Image(_widthchomex_, _heightchomex_);          
-    home\_off.src = "_httpiconchomeof_";             
-}
-
-_javahelp_ {
-    help\_on = new Image(_widthchelpx_, _heightchelpx_);
-    help\_on.src = "_httpiconchelpon_";
-    help\_off = new Image(_widthchelpx_, _heightchelpx_);
-    help\_off.src = "_httpiconchelpof_";
-}
-
-_javapref_ {
-    pref\_on = new Image(_widthcprefx_, _heightcprefx_);          
-    pref\_on.src = "_httpiconcprefon_";
-    pref\_off = new Image(_widthcprefx_, _heightcprefx_);
-    pref\_off.src = "_httpiconcprefof_"; 
-}
-
-_javasearch_ {
-    search\_on = new Image(_widthtsrchx_, _heighttsrchx_);          
-    search\_on.src = "_httpicontsrchon_";
-    search\_off = new Image(_widthtsrchx_, _heighttsrchx_);          
-    search\_off.src = "_httpicontsrchof_";
-}
-
-_javaTitle_ {
-    titles\_on = new Image(_widthttitlx_, _heightttitlx_);
-    titles\_on.src = "_httpiconttitlon_";
-    titles\_off = new Image(_widthttitlx_, _heightttitlx_);
-    titles\_off.src = "_httpiconttitlof_";
-}
-
-_javaList_ {
-    list\_on = new Image(_widthtlistx_, _heighttlistx_);
-    list\_on.src = "_httpicontliston_";
-    list\_off = new Image(_widthtlistx_, _heighttlistx_);
-    list\_off.src = "_httpicontlistof_";
-}
-
-_javaCreator_ {
-    authors\_on = new Image(_widthtauthx_, _heighttauthx_);
-    authors\_on.src = "_httpicontauthon_";
-    authors\_off = new Image(_widthtauthx_, _heighttauthx_);
-    authors\_off.src = "_httpicontauthof_";
-}
-
-_javaSeries_ {
-    series\_on = new Image(_widthtserx_, _heighttserx_);          
-    series\_on.src = "_httpicontseron_";
-    series\_off = new Image(_widthtserx_, _heighttserx_);          
-    series\_off.src = "_httpicontserof_";
-}
-
-_javaDate_ {
-    dates\_on = new Image(_widthtdatex_, _heighttdatex_);          
-    dates\_on.src = "_httpicontdateon_";
-    dates\_off = new Image(_widthtdatex_, _heighttdatex_);          
-    dates\_off.src = "_httpicontdateof_";           
-}
-
-_javaSubject_ {
-    subjects\_on = new Image(_widthtsubjx_, _heighttsubjx_);          
-    subjects\_on.src = "_httpicontsubjon_";
-    subjects\_off = new Image(_widthtsubjx_, _heighttsubjx_);          
-    subjects\_off.src = "_httpicontsubjof_";            
-}
-
-_javaTo_ {
-    to\_on = new Image(_widthttox_, _heightttox_);          
-    to\_on.src = "_httpiconttoon_";
-    to\_off = new Image(_widthttox_, _heightttox_);          
-    to\_off.src = "_httpiconttoof_";            
-}
-
-_javaFrom_ {
-    from\_on = new Image(_widthtfromx_, _heighttfromx_);          
-    from\_on.src = "_httpicontfromon_";
-    from\_off = new Image(_widthtfromx_, _heighttfromx_);          
-    from\_off.src = "_httpicontfromof_";            
-}
-
-_javaHowto_ {
-    how\_on = new Image(_widththowx_, _heightthowx_);          
-    how\_on.src = "_httpiconthowon_";
-    how\_off = new Image(_widththowx_, _heightthowx_);          
-    how\_off.src = "_httpiconthowof_";          
-}
-
-_javaOrganization_ {
-    org\_on = new Image(_widthtorgx_, _heighttorgx_);          
-    org\_on.src = "_httpicontorgon_";
-    org\_off = new Image(_widthtorgx_, _heighttorgx_);          
-    org\_off.src = "_httpicontorgof_";          
-}
-
-_javaTopic_ {
-    topic\_on = new Image(_widthttopicx_, _heightttopicx_);          
-    topic\_on.src = "_httpiconttopicon_";
-    topic\_off = new Image(_widthttopicx_, _heightttopicx_);          
-    topic\_off.src = "_httpiconttopicof_";          
-}
-
-_javaBrowse_ {
-    browse\_on = new Image(_widthtbrwsex_, _heighttbrwsex_);          
-    browse\_on.src = "_httpicontbrwseon_";
-    browse\_off = new Image(_widthtbrwsex_, _heighttbrwsex_);          
-    browse\_off.src = "_httpicontbrwseof_";         
-}
-
-_javaPeople_ {
-        People\_on = new Image(_widthtpeopx_, _heighttpeopx_);
-        People\_on.src = "_httpicontpeopon_";
-        People\_off = new Image(_widthtpeopx_, _heighttpeopx_);
-        People\_off.src = "_httpicontpeopof_";
-}
-
-_javaLanguage_ {
-        Language\_on = new Image(_widthtlangx_, _heighttlangx_);
-        Language\_on.src = "_httpicontlangon_";
-        Language\_off = new Image(_widthtlangx_, _heighttlangx_);
-        Language\_off.src = "_httpicontlangof_";
-}
-
-_javaAcronym_ {
-        Acronym\_on = new Image(_widthtacrox_, _heighttacrox_);
-        Acronym\_on.src = "_httpicontacroon_";
-        Acronym\_off = new Image(_widthtacrox_, _heighttacrox_);
-        Acronym\_off.src = "_httpicontacroof_";
 }
 
@@ -658 +441 @@
 #######################################################################
 
-
-_imageabout_ {<a href="_httppageabout_" 
-    onMouseover = "img\_on('about')" 
-    onMouseout = "img\_off('about')"><img name="about"
-        src="_httpiconcabtof_" width=_widthcabtx_ height=_heightcabtx_
-        border=0 alt="_textimageabout_"></a>}
-
-_imageabout_[v=1] {
-<a href="_httppageabout_">_textimageabout_</a>
-}
-
-_imagehome_ {<a href="_httppagehome_" 
-    onMouseover = "img\_on('home')" 
-    onMouseout = "img\_off('home')"><img name="home"
-        src="_httpiconchomeof_" width="_widthchomex_" height="_heightchomex_"
-        border="0" alt="_textimagehome_"></a>}
-
-_imagehome_[v=1] {
-<a href="_httppagehome_">_textimagehome_</a>
-}
-
-
-_imagehelp_ {<a href="_httppagehelp_"
-    onMouseover = "img\_on('help')" 
-    onMouseout = "img\_off('help')"><img name="help" 
-        src="_httpiconchelpof_" width="_widthchelpx_" height="_heightchelpx_" 
-        border="0" alt="_textimagehelp_"></a>}
-
-_imagehelp_[v=1] {
-<a href="_httppagehelp_">_textimagehelp_</a>
-}
-
-
-_imagepref_ {<a href="_httppagepref_"
-    onMouseover = "img\_on('pref')" 
-    onMouseout = "img\_off('pref')"><img name="pref" 
-        src="_httpiconcprefof_" width="_widthcprefx_" height="_heightcprefx_" border="0" alt="_textimagepref_"></a>}
-
-_imagepref_[v=1] {
-<a href="_httppagepref_">_textimagepref_</a>
-}
+_imagehome_ {_gsimage_(_httppagehome_,_httpiconchomeof_,_httpiconchomeon_,homer,_textimagehome_)}
+
+_imagehelp_ {_gsimage_(_httppagehelp_,_httpiconchelpof_,_httpiconchelpon_,help,_textimagehelp_)}
+
+_imagepref_ {_gsimage_(_httppagepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
 
 _imagegreenstone_ {<img src="_httpicongsdl_" width="_widthgsdl_" height="_heightgsdl_" border="0" alt="_textimagegreenstone_" hspace=0>}
-
 _imagegreenstone_[v=1] {_textimagegreenstone_}

trunk/gsdl/macros/document.dm

@@ -21 +21 @@
 _classificationlinks_
 </center>
-}
-
-
-#######################################################################
-# javascript macros
-#
-# there should be one of these for each flashy javascript button
-# that may appear within a document page
-#######################################################################
-
-# javaextras allows specific collections to include extra java macros
-# without having to override their document action
-_javaextras_ {}
-
-_javadetach_ {
-    detach\_on = new Image(_widthedtchx_, _heightedtchx_); 
-    detach\_on.src = "_httpiconedtchon_";
-    detach\_off = new Image(_widthedtchx_, _heightedtchx_); 
-    detach\_off.src = "_httpiconedtchof_";
-}
-
-_javaexpandcontents_ {
-    expcon\_on = new Image(_widtheexpcx_, _heighteexpcx_);
-    expcon\_on.src = "_httpiconeexpcon_";
-    expcon\_off = new Image(_widtheexpcx_, _heighteexpcx_);
-    expcon\_off.src = "_httpiconeexpcof_";
-}
-
-_javacontractcontents_ {
-    concon\_on = new Image(_widtheconcx_, _heighteconcx_);
-    concon\_on.src = "_httpiconeconcon_";
-    concon\_off = new Image(_widtheconcx_, _heighteconcx_);
-    concon\_off.src = "_httpiconeconcof_";
-}
-
-_javaexpandtext_ {
-    alltext\_on = new Image(_widthealltx_, _heightealltx_);
-    alltext\_on.src = "_httpiconeallton_";
-    alltext\_off = new Image(_widthealltx_, _heightealltx_);
-    alltext\_off.src = "_httpiconealltof_";
-}
-
-_javacontracttext_ {
-    thissec\_on = new Image(_widthetsecx_, _heightetsecx_);
-    thissec\_on.src = "_httpiconetsecon_";
-    thissec\_off = new Image(_widthetsecx_, _heightetsecx_);
-    thissec\_off.src = "_httpiconetsecof_";
-}
-
-_javahighlighting_ {
-    hl\_on = new Image(_widthehlx_, _heightehlx_);
-    hl\_on.src = "_httpiconehlon_";
-    hl\_off = new Image(_widthehlx_, _heightehlx_);
-    hl\_off.src = "_httpiconehlof_";
-}
-
-_javanohighlighting_ {
-    nhl\_on = new Image(_widthenhlx_, _heightenhlx_);
-    nhl\_on.src = "_httpiconenhlon_";
-    nhl\_off = new Image(_widthenhlx_, _heightenhlx_);
-    nhl\_off.src = "_httpiconenhlof_";
-}
-
-_javacontinue_ {
-    cont\_on = new Image(_widthcontx_, _heightcontx_);
-    cont\_on.src = "_httpiconconton_";
-    cont\_off = new Image(_widthcontx_, _heightcontx_);
-    cont\_off.src = "_httpiconcontoff_";
 }
 
@@ -245 +177 @@
 _tab_ {<td>_icontab_</td>}
 
-_iconcontracttoc_ {<img name="concon" src="_httpiconeconcof_" width=_widtheconcx_ height=_heighteconcx_ alt="_texticoncontracttoc_" border=0>}
-_iconcontracttoc_[v=1] {_texticoncontracttoc_}
-
-_iconexpandtoc_ {<img name="expcon" src="_httpiconeexpcof_" width=_widtheexpcx_ height=_heighteexpcx_ alt="_texticonexpandtoc_" border=0>}
-_iconexpandtoc_[v=1] {_texticonexpandtoc_}
-
-_iconcontracttext_ {<img name="thissec" src="_httpiconetsecof_" width=_widthetsecx_ height=_heightetsecx_ alt="_texticoncontracttext_" border=0>}
-_iconcontracttext_[v=1] {_texticoncontracttext_}
-
-_iconexpandtext_ {<img name="alltext" src="_httpiconealltof_" width=_widthealltx_ height=_heightealltx_ alt="_texticonexpandtext_" border=0>}
-_iconexpandtext_[v=1] {_texticonexpandtext_}
-
-_icondetach_ {<img name="detach" src="_httpiconedtchof_" width=_widthedtchx_ height=_heightedtchx_ alt="_texticondetach_" border=0>}
-_icondetach_[v=1] {_texticondetach_}
-
-_iconhighlight_ {<img name="hl" src="_httpiconehlof_" width=_widthehlx_ height=_heightehlx_ alt="_texticonhighlight_" border=0>}
-_iconhighlight_ [v=1] {_texticonhighlight_}
-
-_iconnohighlight_ {<img name="nhl" src="_httpiconenhlof_" width=_widthenhlx_ height=_heightenhlx_ alt="_texticonnohighlight_" border=0>}
-_iconnohighlight_ [v=1] {_texticonnohighlight_}
-
 _iconwarning_ {<img src="_httpiconwarning_" width=_widthwarning_ height=_heightwarning_ border=0 align=left>}
 _iconwarning_ [v=1] {_texticonwarning_}
 
-_iconcont_ {<img name="cont" src="_httpiconcontoff_" width=_widthcontx_ height=_heightcontx_ border=0>}
-_iconcont_ [v=1] {_texticoncont_}
-
 
 #######################################################################
@@ -277 +185 @@
 #######################################################################
 
-_imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=\_blank onMouseover = "img\_on('detach')"
-onMouseout = "img\_off('detach')">_icondetach_</a>}
-_imagedetach_[v=1] {<a href="_httpcurrentdocument_&x=1" target=\_blank>_texticondetach_</a><br>}
-
-_imagehighlight_ {<a href="_httpcurrentdocument_&hl=1&gc=_cgiarggc_&amp;gt=_cgiarggt_" onMouseover = "img\_on('hl')"
-onMouseout = "img\_off('hl')">_iconhighlight_</a>}
-_imagehighlight_ [v=1] {<a href="_httpcurrentdocument_&hl=1&gc=_cgiarggc_&amp;gt=_cgiarggt_">_texticonhighlight_</a><br>}
-
-_imagenohighlight_ {<a href="_httpcurrentdocument_&hl=0&gc=_cgiarggc_&amp;gt=_cgiarggt_" onMouseover = "img\_on('nhl')"
-onMouseout = "img\_off('nhl')">_iconnohighlight_</a>}
-_imagenohighlight_ [v=1] {<a href="_httpcurrentdocument_&hl=0&gc=_cgiarggc_&amp;gt=_cgiarggt_">_texticonnohighlight_</a><br>}
-
-_imagecontracttoc_ {<a href="_httpcurrentdocument_&gc=0" onMouseover = "img\_on('concon')"
-onMouseout = "img\_off('concon')">_iconcontracttoc_</a>}
-_imagecontracttoc_[v=1] {"<a href="_httpcurrentdocument_&gc=0">_texticoncontracttoc_</a><br>}
-
-_imageexpandtoc_ {<a href="_httpcurrentdocument_&gc=1" onMouseover = "img\_on('expcon')"
-onMouseout = "img\_off('expcon')">_iconexpandtoc_</a>}
-_imageexpandtoc_ [v=1] {"<a href="_httpcurrentdocument_&gc=1">_texticonexpandtoc_</a><br>}
-
-_imagecontracttext_ {<a href="_httpcurrentdocument_&amp;gt=0" onMouseover = "img\_on('thissec')"
-onMouseout = "img\_off('thissec')">_iconcontracttext_</a>}
-_imagecontracttext_[v=1] {<a href="_httpcurrentdocument_&amp;gt=0">display only current section</a><br>}
-
-_imageexpandtext_ {<a href="_httpcurrentdocument_&amp;gt=1" onMouseover = "img\_on('alltext')"
-onMouseout = "img\_off('alltext')">_iconexpandtext_</a>}
-_imageexpandtext_[v=1] {<a href="_httpcurrentdocument_&amp;gt=1">display all text</a><br>}
-
-_imagecont_ {<a href="_httpcurrentdocument_&amp;gt=2" onMouseover = "img\_on('cont')"
-onMouseout = "img\_off('cont')">_iconcont_</a>}
-_imagecont_[v=1] {<a href="_httpcurrentdocument&amp;gt=2">_texticoncont_</a><br>}
+# can't use _gsimage_ macro for detach button as we need to include target
+_imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=\_blank onMouseover="roll('detach',1);" onMouseOut="roll('detach',0);"><img
+name="detach" src="_httpiconedtchof_" onLoad="gbutton(this,'_httpiconedtchon_');" border=0 alt="_texticondetach_"></a>}
+_imagedetach_ [v=1] {<a href="_httpcurrentdocument_&x=1" target=\_blank>_texticondetach_</a><br>}
+
+_imagehighlight_ {_gsimage_(_httpcurrentdocument_&hl=1&gc=_cgiarggc_&amp;gt=_cgiarggt_,_document:httpiconehlof_,_document:httpiconehlon_,hl,_document:texticonhighlight_)}
+
+_imagenohighlight_ {_gsimage_(_httpcurrentdocument_&hl=0&gc=_cgiarggc_&amp;gt=_cgiarggt_,_document:httpiconenhlof_,_document:httpiconenhlon_,nhl,_document:texticonnohighlight_)}
+
+_imagecontracttoc_ {_gsimage_(_httpcurrentdocument_&gc=0,_document:httpiconeconcof_,_document:httpiconeconcon_,concon,_document:texticoncontracttoc_)}
+
+_imageexpandtoc_ {_gsimage_(_httpcurrentdocument_&gc=1,_document:httpiconeexpcof_,_document:httpiconeexpcon_,expcon,_document:texticonexpandtoc_)}
+
+_imagecontracttext_ {_gsimage_(_httpcurrentdocument_&amp;gt=0,_document:httpiconetsecof_,_document:httpiconetsecon_,thissec,_document:texticoncontracttext_)}
+
+_imageexpandtext_ {_gsimage_(_httpcurrentdocument_&amp;gt=1,_document:httpiconealltof_,_document:httpiconeallton_,alltext,_document:texticonexpandtext_)}
+
+_imagecont_ {_gsimage_(_httpcurrentdocument_&amp;gt=2,_document:httpiconcontoff_,_document:httpiconconton_,cont,_document:texticoncont_)}
 
 

trunk/gsdl/macros/style.dm

@@ -130 +130 @@
 <script>
 <!--
-    function img\_on(imgName) \{
-        if (version == "n3") \{
-            imgOn = eval(imgName + "\_on.src");
-            document [imgName].src = imgOn;
-        \}
-    \}
-
-    function img\_off(imgName) \{
-        if (version == "n3") \{
-            imgOff = eval(imgName + "\_off.src");
-            document [imgName].src = imgOff;
-        \}
-    \}
-    _If_(_cgiargx_,_scriptdetach_)
-    browserName = navigator.appName;          
-    browserVer = parseInt(navigator.appVersion);
-    if ((browserName == "Netscape" || browserName == "Microsoft Internet Explorer")
-        && browserVer >= 3) version = "n3";
-    else version = "n2";
-              
-    if (version == "n3") \{
-    _javaimagesheader_
-    _javaimagesnavbar_
-    _javaimagescontent_
-    \}
-    _pagescriptextra_
+_imagescript_
+_pagescriptextra_
 // -->
 </script>

trunk/gsdl/src/recpt/Makefile.in

@@ -78 +78 @@
                 userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
-        htmlbrowserclass.h delhistoryaction.h historydb.h
+        htmlbrowserclass.h delhistoryaction.h historydb.h collectoraction.h
 
 RECEPTHEADERS = 
@@ -95 +95 @@
         vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
-        delhistoryaction.cpp historydb.cpp
+        delhistoryaction.cpp historydb.cpp collectoraction.cpp
 
 
@@ -115 +115 @@
         hlistbrowserclass.o datelistbrowserclass.o invbrowserclass.o \
         pagedbrowserclass.o htmlbrowserclass.o delhistoryaction.o \
-        historydb.o parse.yy.o
+        historydb.o parse.yy.o collectoraction.o
 
 RECPTOBJECTS = recptmain.o

trunk/gsdl/src/recpt/documentaction.cpp

@@ -256 +256 @@
 }
 
-// set_navbarmacros sets _navigationbar_, _javaimagesnavbar_ and _httpbrowseXXX_ macros
+// set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros
 // reponse contains 1 metadata field (Title)
 void documentaction::set_navbarmacros (displayclass &disp, FilterResponse_t &response, 
                        cgiargsclass &args) {
 
-  text_t javaimagesnavbar, topparent;
+  text_t topparent;
   text_t &arg_d = args["d"];
   text_t navigationbar = "<!-- Navigation Bar -->\n";
@@ -275 +275 @@
   } else {
     navigationbar += "_imagesearch_";
-    javaimagesnavbar = "_javasearch_";
   }
   
@@ -307 +306 @@
       }
     }
-    if (!unknown) javaimagesnavbar += "_java" + title + "_";
     dochere ++;
   }
@@ -313 +311 @@
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "Global", navigationbar);
-  if (args.getintarg("v") == 0)
-    disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
 }
 
@@ -333 +329 @@
   //                     are Title and Creator classifications _httpbrowseTitle_
   //                     and _httpbrowseCreator_ will be set
-
-  // _javaimagesnavbar_  this is the javascript code to shove in to make the 
-  //                     flashy images used by _navigationbar_ work
 
   // _widthtspace_       the width of the spacers between buttons in navigation
@@ -414 +407 @@
     if (args.getintarg("v") == 0) set_spacemacro (disp, response);
 
-    // set _navigationbar_ and _javaimagesnavbar_ macros
+    // set _navigationbar_ macro
     set_navbarmacros (disp, response, args);
    
@@ -511 +504 @@
 }
 
-void documentaction::set_java_macros (cgiargsclass &args, displayclass &disp) {
-
-  text_t javaimagescontent = "_javaextras_";
-    
-  int arg_gt = args.getintarg("gt");
-  int arg_gc = args.getintarg("gc");
-  int arg_hl = args.getintarg("hl");
-
-  text_tarray::const_iterator button_here = formatinfo.DocumentButtons.begin();
-  text_tarray::const_iterator button_end = formatinfo.DocumentButtons.end();
-
-  while (button_here != button_end) {
-    if (*button_here == "Detach") 
-      javaimagescontent += "_javadetach_";
-    else if (*button_here == "Expand Text") {
-      if (arg_gt == 1)
-    javaimagescontent += "_javacontracttext__javacontinue_";
-      else if (arg_gt == 2)
-    javaimagescontent += "_javacontracttext_";
-      else
-    javaimagescontent += "_javaexpandtext_";
-    } else if (*button_here == "Expand Contents") {
-      if (arg_gc == 1)
-    javaimagescontent += "_javacontractcontents_";
-      else
-    javaimagescontent += "_javaexpandcontents_";
-    } else if (*button_here == "Highlight") {
-      if (arg_hl == 1)
-    javaimagescontent += "_javanohighlighting_";
-      else 
-    javaimagescontent += "_javahighlighting_";
-    }
-    button_here ++;
-  }
-  disp.setmacro ("javaimagescontent", "document", javaimagescontent);
-}
-
 
 // define all the macros which are related to pages generated
@@ -566 +522 @@
   // _header_               the header macro is overridden if we're not at a top level 
   //                        classification to remove the title block
-
-  // _javaimagescontent_    this is the javascript code to shove in to make the 
-  //                        flashy buttons work
 
   // _thisOID_              the OID (directory) of the current document - this corresponds
@@ -645 +598 @@
     disp.setmacro ("thisOID", "Global", dm_safe(thisOID));
       }
-      
-      if (args["u"] != "1")
-    set_java_macros (args, disp);
-
     }
   } else {

trunk/gsdl/src/recpt/documentaction.h

@@ -48 +48 @@
   void set_navbarmacros (displayclass &disp, FilterResponse_t &response, 
              cgiargsclass &args);
-
-  virtual void set_java_macros (cgiargsclass &args, displayclass &disp);
 
   void get_classificationlinks (const text_t &arg_cl, const text_t &collection,

trunk/gsdl/src/recpt/librarymain.cpp

@@ -53 +53 @@
 #include "delhistoryaction.h"
 #include "tipaction.h"
+#include "collectoraction.h"
 
 #include "browserclass.h"
@@ -264 +265 @@
   recpt.add_action(&adelhistoryaction);
 
+  collectoraction acollectoraction;
+  acollectoraction.set_receptionist (&recpt);
+  recpt.add_action(&acollectoraction);
+
   // list of browsers
   vlistbrowserclass avlistbrowserclass;