Changeset 12 for trunk

Timestamp:

09/10/09 17:41:30 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Moved "Listing n of m <blahs> in <foo>" to its own template, and
shuffled code to match
Misc changes, checkpoint

Location:

trunk

Files:

• TODO (modified) (1 diff)
• dns.cgi (modified) (4 diffs)
• templates/domlist.tmpl (modified) (1 diff)
• templates/pgcount.tmpl (added)
• templates/reclist.tmpl (modified) (1 diff)

trunk/TODO

@@ -13 +13 @@
    - throw garbage at it and see what sticks
    - throw deliberately malformed data and see what sticks
+ - rDNS matching
+   - tag'n'warn records where forward and reverse are both supposed to be published
+     "here" - mainly prevents unneccessary record duplication

trunk/dns.cgi

@@ -114 +114 @@
     my ($count) = ($sth->fetchrow_array);
 
-  $page->param(ntot => $count);
-  $page->param(nfirst => 1);
-  $page->param(nlast => 10);
-
+# fill the page-count and first-previous-next-last-all details
+  fill_pgcount($count,"records",domainName($dbh,$webvar{id}));
   fill_fpnla($count);  # should put some params on this sub...
-
-##fixme
-  $page->param(domain => domainName($dbh,$webvar{id}));
-  $page->param(id => $webvar{id});
-##fixme
 
   $page->param(defrec => $webvar{defrec});
   if ($webvar{defrec} eq 'y') {
+##fixme: hardcoded group
     showdomain('y',1);
   } else {
@@ -278 +272 @@
   if ($code eq 'OK') {
 # redirect to dns.cgi?etc&page=reclist
-    print $q->redirect("");
+    changepage(page => "reclist", id => $msg);
     $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
     showdomain(0,$msg);
@@ -454 +448 @@
 
 
+sub fill_pgcount {
+  my $pgcount = shift;
+  my $pgtype = shift;
+  my $parent = shift;
+
+  $page->param(ntot => $pgcount);
+  $page->param(nfirst => (($offset eq 'all' ? 0 : $offset)*$perpage+1));
+  $page->param(npglast => ($offset eq 'all' ? $pgcount :
+        ( (($offset+1)*$perpage) > $pgcount ? $pgcount : (($offset+1)*$perpage) )
+        ));
+  $page->param(pgtype => $pgtype);
+  $page->param(parent => $parent);
+} # end fill_pgcount()
+
+
 sub listdomains {
   my $sth = $dbh->prepare("select count(*) from domains");
@@ -459 +468 @@
   my ($count) = ($sth->fetchrow_array);
 
+# fill page count and first-previous-next-last-all bits
+##fixme - hardcoded group bit
+  fill_pgcount($count,"domains","default group");
   fill_fpnla($count);
-
-  $page->param(ndomains => $count);
-  $page->param(nstart => (($offset eq 'all' ? 0 : $offset)*$perpage+1));
-  $page->param(npglast => ($offset eq 'all' ? $count :
-        ( (($offset+1)*$perpage) > $count ? $count : (($offset+1)*$perpage) )
-        ));
 
 ##fixme - group

trunk/templates/domlist.tmpl

@@ -6 +6 @@
 <table width="98%">
 <tr><td colspan=3 align=center>Domain list</td></tr>
-<tr><td>Listing <TMPL_VAR NAME=nstart> - <TMPL_VAR NAME=npglast> of <TMPL_VAR NAME=ndomains> Domains</td>
+<tr><td><TMPL_INCLUDE NAME="pgcount.tmpl"></td>
 <td>
 <TMPL_IF navfirst><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist&offset=0"><img src="images/frev.png" border=0>first</a><TMPL_ELSE><img src="images/frev.png" border=0>first</TMPL_IF>&nbsp;

trunk/templates/reclist.tmpl

@@ -12 +12 @@
 <tr class="darkrowheader">
         <td colspan>
-        Listing <TMPL_VAR NAME=nfirst> - <TMPL_VAR NAME=nlast> of <TMPL_VAR NAME=ntot> entries in <TMPL_VAR NAME=domain>
+        <TMPL_INCLUDE NAME="pgcount.tmpl">
         </td>
         <td align=center>