Ignore:
Timestamp:
2011-01-05T09:18:04+13:00 (13 years ago)
Author:
sjm84
Message:

Merging the latest trunk changes into this branch

Location:
main/branches/64_bit_Greenstone/greenstone2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone2

  • main/branches/64_bit_Greenstone/greenstone2/macros/seaweed.dm

    r23502 r23523  
    11package Global
    22
    3 _seaweed_ {
     3_seaweedscript_ {
    44
    55
     
    2727
    2828<script type="text/javascript" src="_httpscript_/seaweed.js"></script>
    29 <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script>
    3029
    3130
     
    126125
    127126  window.onload=function()\{
    128 //      try \{
     127      try \{
    129128      de.init();
    130129      if (window.addEventListener) \{
     
    141140       \});
    142141       
    143 /*      \}
     142      \}
    144143      catch(err) \{
    145144        alert("SeaWeed failed to initialise: " + err.message);
    146145      \}
    147 */
    148146  \}
    149147
     
    197195
    198196
     197   
     198  function seaweedReindexCollection() \{
     199    var arc = document.getElementById("seaweedRC");
     200    arc.innerHTML = "reindexing ...";
     201    gsapi.reindexCollection("incremental",seaweedReindexCallback);
     202  \}
     203
     204  function seaweedReindexCallback(xmlHttp) \{
     205    var arc = document.getElementById("seaweedRC");
     206    arc.innerHTML = "reindexing done.";
     207  \}           
     208   
     209
    199210</script>
    200211
    201 
    202212}
     213
     214_first-metadata-spanwrap_ {<span metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
     215_/first-metadata-spanwrap_ {</span>}
     216
     217_first-metadata-divwrap_ {<div metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
     218_/first-metadata-divwrap_ {</div>}
Note: See TracChangeset for help on using the changeset viewer.