Changeset 11873


Ignore:
Timestamp:
2006-05-29T13:40:57+12:00 (18 years ago)
Author:
mdewsnip
Message:

Tidied up some things in the static macrofile writing in preparation for reorganising the code to reduce duplication.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r11868 r11873  
    348348    # Build mappings for creating the static macrofiles
    349349    my $institution_name = $row_hashref->{"Institution_Name"};
    350     $institution_name_to_id_mapping{$institution_name} = $institution_id;
     350    $institution_name_to_id_mapping{$institution_name} = $institution_doc_obj->get_OID();
    351351    my $institution_state = $row_hashref->{"State"};
    352352    push(@{$institution_state_to_name_mapping{$institution_state}}, $institution_name);
    … …  
    354354
    355355    # Write the institutions.dm macrofile
    356     &write_static_browser_macrofile("institutions", \%institution_name_to_id_mapping, "i");
     356    &write_static_browser_macrofile("institutions", \%institution_name_to_id_mapping);
    357357
    358358    # Write the states.dm macrofile
    … …  
    490490    my $place_institution = $place_institution_sql_handle->fetchrow();
    491491    &new_metadata_entry($place_doc_obj, "Institution_name", $place_institution);
    492     $place_id_to_institution_name_mapping{$place_id} = ", " . $place_institution;
     492    $place_id_to_institution_name_mapping{$place_doc_obj->get_OID()} = ", " . $place_institution;
    493493
    494494    # Get place state (for searching)
    … …  
    599599
    600600    # Build mappings for creating the static macrofiles
    601     $place_name_to_id_mapping{$place_name} = $place_id;
     601    $place_name_to_id_mapping{$place_name} = $place_doc_obj->get_OID();
    602602    push(@{$place_type_to_names_mapping{$place_type}}, $place_name);
    603603    }
    604604
    605     &write_bilevel_static_browser_macrofile("types", \%place_type_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping, "p", 2);
    606     &write_bilevel_static_browser_macrofile("styles", \%place_style_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping, "p", 2);
    607     &write_bilevel_static_browser_macrofile("dates", \%place_date_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping, "p", 2);
    608     &write_bilevel_static_browser_macrofile("functions", \%place_function_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping, "p", 2);
     605    &write_bilevel_static_browser_macrofile("types", \%place_type_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping);
     606    &write_bilevel_static_browser_macrofile("styles", \%place_style_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping);
     607    &write_bilevel_static_browser_macrofile("dates", \%place_date_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping);
     608    &write_bilevel_static_browser_macrofile("functions", \%place_function_to_names_mapping, \%place_name_to_id_mapping, \%place_id_to_institution_name_mapping);
    609609}
    610610
    … …  
    640640        if (!defined($designer_name_to_id_mapping{$designer_name})) {
    641641        $designer_count++;
    642         $designer_name_to_id_mapping{$designer_name} = "$designer_count";
     642        $designer_name_to_id_mapping{$designer_name} = "d" . $designer_count;
    643643        }
    644644
    … …  
    652652    # print STDERR "       Designer $designer_id\n";
    653653    my $designer_doc_obj = new doc($self->{'filename'} . "-", "indexed_doc");
    654     $designer_doc_obj->set_OID("d$designer_id");
     654    $designer_doc_obj->set_OID($designer_id);
    655655    &new_metadata_entry($designer_doc_obj, "DocumentType", "Designer");
    656656
    … …  
    682682
    683683    # Write the designers.dm macrofile
    684     &write_static_browser_macrofile("designers", \%designer_name_to_id_mapping, "d", 2);
     684    &write_static_browser_macrofile("designers", \%designer_name_to_id_mapping);
    685685}
    686686
    … …  
    857857    my $static_browser_package_name = shift(@_);
    858858    my $name_to_id_mapping = shift(@_);
    859     my $id_prefix = shift(@_);
    860859    my $table_columns = 2;
    861860
    … …  
    894893
    895894        my $name = $letter_names[$i];
    896         my $id = $id_prefix . $name_to_id_mapping->{$name};
     895        my $id = $name_to_id_mapping->{$name};
    897896        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>";
    898897
    899898        $name = $letter_names[$i+$half_point];
    900899        if (defined($name)) {
    901         $id = $id_prefix . $name_to_id_mapping->{$name};
     900        $id = $name_to_id_mapping->{$name};
    902901        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>";
    903902        }
    … …  
    920919    my $name_to_id_mapping = shift(@_);
    921920    my $id_to_extra_mapping = shift(@_);
    922     my $id_prefix = shift(@_);
    923     my $table_columns = shift(@_);
     921    my $table_columns = 2;
    924922
    925923    my $static_browser_macrofile_path = "$ENV{'GSDLHOME'}\\collect\\cic-hcap\\macros\\$static_browser_package_root.dm";
    … …  
    960958            print BROWSER_MACROFILE "</tr>\n";
    961959        }
    962         if ($table_columns == 2) {
    963             print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$1\"/><span style=\"color: black;\"><b>$1</b></span></td><td width=\"50%\"></td></tr>\n";
    964         }
    965         else {
    966             print BROWSER_MACROFILE "<tr><td width=\"33%\"><br /><a name=\"$1\"/><span style=\"color: black;\"><b>$1</b></span></td><td style=\"padding-left: 3px; padding-right: 3px;\" width=\"34%\"></td><td width=\"33%\"></td></tr>\n";
    967         }
     960        print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$1\"/><span style=\"color: black;\"><b>$1</b></span></td><td width=\"50%\"></td></tr>\n";
    968961        $current_letter = $1;
    969962        }
    … …  
    978971        print BROWSER_MACROFILE "<tr>";
    979972        }
    980         print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id_prefix$id\">$name</a>$extra</td>";
     973        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
    981974        $current_position++;
    982975        if ($current_position == $table_columns) {
    … …  
    1001994    my $name_to_id_mapping = shift(@_);
    1002995    my $id_to_extra_mapping = shift(@_);
    1003     my $id_prefix = shift(@_);
    1004     my $table_columns = shift(@_);
     996    my $table_columns = 2;
    1005997
    1006998    my $static_browser_macrofile_path = "$ENV{'GSDLHOME'}\\collect\\cic-hcap\\macros\\$static_browser_package_root.dm";
    … …  
    10471039        my $id = $name_to_id_mapping->{$name};
    10481040        my $extra = $id_to_extra_mapping->{$id};
    1049         print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id_prefix$id\">$name</a>$extra</td>";
     1041        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
    10501042
    10511043        $name = $letter_names[$i+$half_point];
    … …  
    10531045            $id = $name_to_id_mapping->{$name};
    10541046            $extra = $id_to_extra_mapping->{$id};
    1055             print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id_prefix$id\">$name</a>$extra</td>";
     1047            print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
    10561048        }
    10571049        else {
    … …  
    11701162        print BROWSER_MACROFILE "<tr>";
    11711163        }
    1172         print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=i$id\">$name</a></td>";
     1164        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>";
    11731165        $current_position++;
    11741166        if ($current_position == 3) {
Note: See TracChangeset for help on using the changeset viewer.