Changeset 11913

Timestamp:

2006-06-02T16:30:40+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed up the designers static browser, and sorted the others correctly.

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (5 diffs)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -190 +190 @@
     my $dbh = DBI->connect('dbi:ODBC:CIC-HCAP');
 
-    $self->process_institutions($dbh);
-    $self->process_places($dbh);
+    # $self->process_institutions($dbh);
+    # $self->process_places($dbh);
     $self->process_designers($dbh);
 
@@ -654 +654 @@
     my %designer_name_to_place_ids_mapping;
     my %designer_name_to_id_mapping;
+    my %designer_id_to_name_mapping;
     my $designer_count = 0;
     while (my $designer_hashref = $designer_sql_handle->fetchrow_hashref) {
@@ -668 +669 @@
         }
 
+        $designer_id_to_name_mapping{$designer_name_to_id_mapping{$designer_name}} = $designer_name;
         push(@{$designer_name_to_place_ids_mapping{$designer_name}}, $designer_hashref->{"Entry_ID"});
     }
@@ -720 +722 @@
 
     # Write the designers.dm macrofile
-    &write_static_browser_macrofile("designers", \%designer_name_to_id_mapping);
+    &write_static_browser_macrofile("designers", \%designer_id_to_name_mapping);
 }
 
@@ -954 +956 @@
     print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$chunk_title\"/><span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>\n";
 
-    my @chunk_ids = @{$chunk_ids_ref};
-    my $half_point = ((scalar(@chunk_ids) % 2 == 0) ? scalar(@chunk_ids) / 2 : (scalar(@chunk_ids) + 1) / 2);
+    my %full_name_to_id_mapping;
+    foreach my $id (@{$chunk_ids_ref}) {
+    my $full_name = $id_to_name_mapping->{$id};
+    if (defined($id_to_extra_mapping)) {
+        $full_name .= " " . $id_to_extra_mapping->{$id};
+    }
+    $full_name_to_id_mapping{$full_name} = $id;
+    }
+ 
+    my @full_names = sort(keys(%full_name_to_id_mapping));
+    my $half_point = ((scalar(@full_names) % 2 == 0) ? scalar(@full_names) / 2 : (scalar(@full_names) + 1) / 2);
     for (my $i = 0; $i < $half_point; $i++) {
     print BROWSER_MACROFILE "<tr>";
 
-    my $id = $chunk_ids[$i];
+    my $id = $full_name_to_id_mapping{$full_names[$i]};
     my $name = $id_to_name_mapping->{$id};
-    my $extra = "";
-    if (defined($id_to_extra_mapping)) {
-        $extra = $id_to_extra_mapping->{$id};
-    }
+    my $extra = $id_to_extra_mapping->{$id} || "";
     print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
 
-    $id = $chunk_ids[$i+$half_point];
-    if (defined($id)) {
+    print BROWSER_MACROFILE "<td valign=\"top\">";
+    if (defined($full_names[$i+$half_point])) {
+        $id = $full_name_to_id_mapping{$full_names[$i+$half_point]};
         $name = $id_to_name_mapping->{$id};
-        $extra = "";
-        if (defined($id_to_extra_mapping)) {
-        $extra = $id_to_extra_mapping->{$id};
-        }
-        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
-    }
-    else {
-        print BROWSER_MACROFILE "<td></td>";
-    }
+        $extra = $id_to_extra_mapping->{$id} || "";
+        print BROWSER_MACROFILE "<a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra";
+    }
+    print BROWSER_MACROFILE "</td>";
 
     print BROWSER_MACROFILE "</tr>\n";