paginating through search results

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@179 fe716a7a-6dde-0310-88d9-d003556173a8

6 files changed, 79 insertions, 5 deletions

diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 398dd78..bf6df73 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -19,64 +19,70 @@
  <script type="application/x-javascript" src="fireflix.js" />
 
  <stringbundleset>
   <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
  </stringbundleset>
 
  <commandset>
   <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
   oncommand="fireflix.on_cmd_auth()"/>
   <command id="cmd_auth_done" label="&panel.auth.done.label;"
   oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
   <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
   oncommand="fireflix.openTab('htp://www.flickr.com/')" />
   <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
   oncommand="fireflix.on_cmd_auth_unauth()" />
  </commandset>
  
  <popupset>
   <popup id="auth_menu">
    <menuitem command="cmd_auth_auth"/>
    <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
    <menuitem command="cmd_auth_unauth" />
    <menuseparator/>
    <menuitem command="cmd_auth_open_flickr"/>
   </popup>
  </popupset>
 
  <commandset id="cmdset_search">
   <command id="cmd_search" label="&panel.search.cmd_search.label;"
   oncommand="fireflix.foundphotos.search_photos()"/>
   <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
   oncommand="fireflix.foundphotos.on_cmd_open(event)" />
+  <command id="cmd_search_prev_page"
+  label="&panel.search.cmd_search_prev_page.label;"
+  oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/>
+  <command id="cmd_search_next_page"
+  label="&panel.search.cmd_search_next_page.label;"
+  oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/>
  </commandset>
 
  <commandset id="cmdset_sets">
   <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
   oncommand="fireflix.on_refresh_sets()" />
   <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
   oncommand="fireflix.on_set_props()" disabled="true" />
  </commandset>
 
  <popupset>
   <popup id="sets_menu">
    <menuitem command="cmd_set_props"/>
    <menuitem command="cmd_refresh_sets"/>
    <menuseparator/>
    <menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
   </popup>
  </popupset>
 
  <commandset id="cmdset_uploads">
   <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
   oncommand="fireflix.uploads.on_clear()" />
   <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
   oncommand="fireflix.uploads.on_upload()" />
   <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
   oncommand="fireflix.uploads.on_remove()" />
   <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
   oncommand="fireflix.uploads.on_add()" />
  </commandset>
 
  <popupset>
   <popup id="uploads_menu">
    <menuitem command="cmd_uploads_add"/>
@@ -101,64 +107,71 @@
     tooltiptext="&panel.auth.flickr.tip;"/>
    </hbox>
   </groupbox>
 
   <tabbox flex="1" id="fireflix_tabs">
 
    <tabs>
     <tab label="&panel.tabs.search;"/>
     <tab label="&panel.tabs.sets;"/>
     <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
     <tab id="tab_upload" label="&panel.tabs.upload;"/>
    </tabs>
 
    <tabpanels flex="1">
 
     <tabpanel id="tabpanel_search" flex="1">
      <vbox flex="1">
       <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
        <hbox>
         <label control="search_for" value="&panel.search.search_for.label;"
         accesskey="s"/>
         <textbox id="search_for" flex="1"/>
        </hbox>
        <hbox>
         <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
         tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
         accesskey="t" />
         <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
         <spacer flex="1"/>
         <button command="cmd_search"/>
        </hbox>
       </groupbox>
+      <hbox>
+       <button command="cmd_search_prev_page"/>
+       <spacer flex="1"/>
+       <label id="search_page" hidden="true"/>
+       <spacer flex="1"/>
+       <button command="cmd_search_next_page"/>
+      </hbox>
       <tree id="searchresults" rows="2" flex="1"
       onselect="fireflix.foundphotos.on_select()"
       ondblclick="fireflix.foundphotos.on_cmd_open(event)"
       onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
       fireflix.foundphotos.on_cmd_open(event)">
        <treecols>
         <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
        </treecols>
        <treechildren/>
       </tree>
       <groupbox id="searchresult_props" orient="horizontal" hidden="true">
        <vbox width="100" pack="center">
         <hbox pack="center">
          <image id="search_photo"/>
         </hbox>
        </vbox>
        <vbox flex="1">
         <label id="searchresult_title" crop="end"/>
         <hbox flex="1" pack="center">
          <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
         </hbox>
         <hbox pack="end">
          <button command="cmd_search_open"/>
         </hbox>
        </vbox>
       </groupbox>
      </vbox>
     </tabpanel>
 
     <tabpanel id="tabpanel_sets" flex="1"
      onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
      document.getElementById('setphotos').focus()">
diff --git a/content/fireflix.css b/content/fireflix.css
index 71080d1..9e7bf6b 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -58,32 +58,42 @@ image#search_photo, image#set_photo, image#set_primary {
 .about .title {
  font-size: 300%;
  font-weight: bold;
  color: yellow;
 }
 .about .link {
  text-decoration: underline;
  color: white;
  cursor: pointer;
 }
 
 menuitem.menuhead {
  background: gray;
  color: black;
  font-weight: bold;
 }
 
 div#searchresult_description {
  min-height: 5em; max-height: 8em;
  overflow: auto;
  font-size: 90%;
  margin: 0.1ex 0.5ex;
 }
 
 #copying div {
  margin: 1ex 1em;
  font-family: courier, monospace;
  font-size: 9pt;
  padding: 2px;
  border: dotted 1px gray;
  background: white;
 }
+
+label#search_page {
+ font-weight: bold;
+ background: white; color: #404040;
+ border-color: #c0c0c0 #404040 #404040 #c0c0c0;
+ border-style: solid;
+ border-width: 1px;
+ -moz-border-radius: 1em;
+ padding: 0.5ex 1ex;
+}
diff --git a/content/fireflix.js b/content/fireflix.js
index e144aae..92c42f4 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -663,129 +663,169 @@ var fireflix = {
    {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'original_format',
     user_id: 'me',
     per_page: pp
    },
    function(xr) {
     var x = xr.responseXML;
     var rv = '';
     for(var pn in pids) {
      var p = pids[pn];
      var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
      rv += _this.photo_html(pp,uti,utl)+'\n';
     }
     _this.popup_content(rv);
    }, function(x,s,c,m) {
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
 
  /*
   *
   */
  foundphotos: {
   fireflix: null,
   init: function(f) {
    this.fireflix = f;
    pull_elements(this,document,[
     'search_for','search_tags','search_mine',
     'searchresult_props','search_photo',
-    'searchresult_title','searchresult_description'
+    'searchresult_title','searchresult_description',
+    'search_page','cmd_search_prev_page','cmd_search_next_page'
    ]);
    document.getElementById('searchresults').view = this;
   },
   photos: new Array(),
   rowCount: 0,
   getCellText: function(r,c) {
    var p = this.photos[r];
    if(c.id=='sr_title') return p.title;
    return c.id;
   },
   setTree: function(t) { this.tree = t },
   isContainer: function(r) { return false },
   isSeparator: function(r) { return false },
   isSorted: function(r) { return false },
   getLevel: function(r) { return 0 },
   getImageSrc: function(r,c) { return null },
   getRowProperties: function(r,p) { },
   getCellProperties: function(cid,cel,p) { },
   getColumnProperties: function(cid,cel,p) { },
   cycleHeader: function(cid,e) { },
   getParentIndex: function(r) { return -1 },
   drop: function(r,o) { },
   canDropBeforeAfter: function(r,b) { return false },
 
   importXPR: function(xp) {
    this.selection.clearSelection();
    this.selection.currentIndex = -1;
    this.searchresult_props.hidden = true;
    this.tree.beginUpdateBatch();
    this.photos = new Array();
    var n; while(n=xp.iterateNext()) {
     this.photos.push(new Photo(n));
    }
    this.rowCount = this.photos.length;
    this.tree.endUpdateBatch();
   },
+  paging: {
+   pars: null,
+   page: null, pages: null, perpage: null, total: null
+  },
   search_photos: function() {
    var pars = {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
    };
    if(this.search_mine.checked)
     pars.user_id='me';
    if(this.search_tags.checked) {
     pars.tags=this.search_for.value.split(/ +/).join(',');
    }else{
     pars.text=this.search_for.value;
    }
+   this.paging.pars = new Object();
+   this.paging.page = null; this.paging.pages = null;
+   this.paging.perpage = null; this.paging.total = null;
+   for(var p in pars) this.paging.pars[p] = pars[p];
+   this.perform_search(pars);
+  },
+  perform_search: function(p) {
    var _this = this;
-   this.fireflix.flickr.api_call( pars,
+   this.fireflix.flickr.api_call( p,
     function(xr) {
      var x = xr.responseXML;
-     var xp = x.evaluate(
-      '/rsp/photos/photo', x, null,
-      XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
+     var xp = xp_nodes('/rsp/photos/photo',x);
      _this.importXPR(xp);
      _this.tree.ensureRowIsVisible(0);
+     xp = xp_node('/rsp/photos',x);
+     _this.paging.page = parseInt(xp.getAttribute('page'));
+     _this.paging.pages = parseInt(xp.getAttribute('pages'));
+     _this.paging.perpage = parseInt(xp.getAttribute('perpage'));
+     _this.paging.total = parseInt(xp.getAttribute('total'));
+     _this.update_paging();
      _this.on_select();
     }, function(x,s,c,m) {
      _this.fireflix.flickr_failure(x,s,c,m);
     }
    );
   },
+  on_cmd_prev: function(ev) {
+   var pars = new Object();
+   for(var p in this.paging.pars) pars[p] = this.paging.pars[p];
+   pars.page=this.paging.page-1; pars.per_page=this.paging.perpage;
+   this.perform_search(pars);
+  },
+  on_cmd_next: function(ev) {
+   var pars = new Object();
+   for(var p in this.paging.pars) pars[p] = this.paging.pars[p];
+   pars.page=this.paging.page+1; pars.per_page=this.paging.perpage;
+   this.perform_search(pars);
+  },
+  update_paging: function() {
+   if(! (this.paging.pars && this.paging.page && this.paging.pages) ) {
+    this.search_page.value=''; this.search_page.hidden = true;
+    this.cmd_search_prev_page.setAttribute('disabled','true');
+    this.cmd_search_next_page.setAttribute('disabled','true');
+   }else{
+    this.search_page.value=this.fireflix.loc_strings.getFormattedString('search_page',[this.paging.page,this.paging.pages]);
+    this.search_page.hidden=false;
+    this.cmd_search_prev_page.setAttribute('disabled',(this.paging.page>1)?'false':'true');
+    this.cmd_search_next_page.setAttribute('disabled',(this.paging.page<this.paging.pages)?'false':'true');
+   }
+  },
   render_description_frame: function(content) {
    if(!content) {
     this.searchresult_description.innerHTML = '';
    }else{
     this.searchresult_description.innerHTML = content?content:'';
     /* of all linking elements flickr only allows a */
     var as = this.searchresult_description.getElementsByTagName('a');
     for(var a=0;a<as.length;++a)
      as.item(a).setAttribute('target','_blank');
    }
   },
   on_select: function() {
    if(this.selection.currentIndex<0) {
     this.searchresult_props.hidden = true;
    }else{
     var p = this.photos[this.selection.currentIndex];
     if(!p) {
      this.searchresult_props.hidden = true;
     }else{
      this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
      this.searchresult_title.value = p.title;
      this.searchresult_title.tooltipText = p.title;
      this.render_description_frame(null);
      if(p.description==null && p.description==undefined) {
       var pid = p.id;
       var ci = this.selection.currentIndex;
       var _this = this;
       this.fireflix.flickr.api_call(
        {
         method: 'flickr.photos.getInfo',
         auth_token: 'default',
         photo_id: p.id,
diff --git a/content/util.js b/content/util.js
index c4af09e..ccc61cf 100644
--- a/content/util.js
+++ b/content/util.js
@@ -29,42 +29,49 @@ function toutf8(ucode) {
     0x80|((cc>>18)&0x3f),
     0x80|((cc>>12)&0x3f),
     0x80|((cc>> 6)&0x3f),
     0x80|( cc     &0x3f) );
   else if(cc<=0x7fffffff)
    rv += String.fromCharCode(
     0xfc|((cc>>30)&0x01),
     0x80|((cc>>24)&0x3f),
     0x80|((cc>>18)&0x3f),
     0x80|((cc>>12)&0x3f),
     0x80|((cc>> 6)&0x3f),
     0x80|( cc     &0x3f) );
  }
  return rv;
 }
 
 /*
  * extract xpath-specified string value
  */
 function xp_str(xp,x) {
  var rv = x.evaluate(
   xp, x, null, XPathResult.STRING_TYPE, null );
  return rv.stringValue;
 }
 /*
  * extract xpath-specified node
  */
 function xp_node(xp,x) {
  var rv = x.evaluate(
   xp, x, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null );
  return rv.singleNodeValue;
 }
+/*
+ * extract xpath-specified ordered set of nodes
+ */
+function xp_nodes(xp,x) {
+ return x.evaluate(
+  xp, x, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
+}
 
 /*
  * pull in elements into documents as a member variables
  */
 function pull_elements(th,d,els) {
  for(var e in els) {
   var en=els[e];
   th[en] = d.getElementById(en);
  }
 }
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index f4ceb79..88ec6fb 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -6,64 +6,66 @@
 <!ENTITY aboutFireflix "About Fireflix" >
 <!ENTITY about.ok.label "OK">
 <!ENTITY about.license.label "License">
 <!ENTITY about.license.tip "Show copying policy">
 
 <!-- COPYING -->
 
 <!ENTITY copying.title "Filreflix: copying policy">
 
 <!-- Sidebar -->
 
 <!ENTITY panel.auth_info "Authorization info">
 <!ENTITY panel.no_auth_info "No auth info available">
 
 <!ENTITY panel.auth.auth.label "Authorize">
 <!ENTITY panel.auth.done.label "Authorization complete">
 <!ENTITY panel.auth.flickr.label "Flickr">
 <!ENTITY panel.auth.flickr.tip "Open Flickr in new tab">
 <!ENTITY panel.auth.unauth.label "Sign off">
 
 <!ENTITY panel.tabs.search "Search" >
 <!ENTITY panel.tabs.sets "Sets" >
 <!ENTITY panel.tabs.tags "Tags" >
 <!ENTITY panel.tabs.upload "Upload" >
 
 <!ENTITY panel.search.cmd_search.label "Search" >
 <!ENTITY panel.search.search_for.label "Search for:" >
 <!ENTITY panel.search.mode.tagsonly.label "tags">
 <!ENTITY panel.search.mode.tagsonly.tip "Search tags only">
 <!ENTITY panel.search.mode.mine.label "mine">
 <!ENTITY panel.search.col.title.label "Title">
 <!ENTITY panel.search.cmd_search_open.label "Open">
+<!ENTITY panel.search.cmd_search_prev_page.label "«">
+<!ENTITY panel.search.cmd_search_next_page.label "»">
 
 <!ENTITY panel.sets.name.label "Set">
 <!ENTITY panel.sets.name.tip "Photoset name">
 <!ENTITY panel.sets.photos.label "Photos">
 <!ENTITY panel.sets.photos.tip "Number of photos in set">
 
 <!ENTITY panel.sets.cmd_refresh_sets "Refresh">
 <!ENTITY panel.sets.cmd_properties "Properties">
 
 <!ENTITY panel.sets.generate_html "Generate HTML">
 
 <!ENTITY panel.setphotos.title.label "Title">
 <!ENTITY panel.setphotos.title.tip "Picture title">
 <!ENTITY panel.setphotos.taken.label "Taken">
 <!ENTITY panel.setphotos.taken.tip "When the picture was taken">
 <!ENTITY panel.setphotos.upload.label "Uploaded">
 <!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
 
 <!ENTITY panel.tagslist.tag.label "Tag">
 
 <!ENTITY panel.uploadlist.file.label "File name">
 <!ENTITY panel.uploadlist.title.label "Title">
 <!ENTITY panel.uploadlist.status.label "Status">
 
 <!ENTITY panel.upload_props.filename.label "File:">
 <!ENTITY panel.upload_props.title.label "Title:">
 <!ENTITY panel.upload_props.tags.label "Tags:">
 
 <!ENTITY panel.uploads.upload.label "Upload">
 <!ENTITY panel.uploads.clear.label "Clear">
 <!ENTITY panel.uploads.remove.label "Remove">
 <!ENTITY panel.uploads.add.label "Add">
diff --git a/locale/en-US/fireflix.properties b/locale/en-US/fireflix.properties
index 7caa12f..18300ff 100644
--- a/locale/en-US/fireflix.properties
+++ b/locale/en-US/fireflix.properties
@@ -1,11 +1,13 @@
 postUploadPhotoset=Create a new photoset for uploaded photos (cancel if you don't want to create a photoset)
 
 menutitle_Images=Images
 menutitle_Links=Linked to…
 urltype_s=Small square (75x75)
 urltype_t=Thumbnail (fits in 100x100)
 urltype_m=Small (fits in 240x240)
 urltype__=Medium (fits in 500x500)
 urltype_b=Large (fits in 1024x1024)
 urltype_o=Original image
 urltype_p=Flickr photo URL
+
+search_page=Page %S of %S