Changeset 11873
- Timestamp:
- 2006-05-29T13:40:57+12:00 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cic-hcap/perllib/plugins/CICPlug.pm
r11868 r11873 348 348 # Build mappings for creating the static macrofiles 349 349 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(); 351 351 my $institution_state = $row_hashref->{"State"}; 352 352 push(@{$institution_state_to_name_mapping{$institution_state}}, $institution_name); … … 354 354 355 355 # 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); 357 357 358 358 # Write the states.dm macrofile … … 490 490 my $place_institution = $place_institution_sql_handle->fetchrow(); 491 491 &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; 493 493 494 494 # Get place state (for searching) … … 599 599 600 600 # 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(); 602 602 push(@{$place_type_to_names_mapping{$place_type}}, $place_name); 603 603 } 604 604 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); 609 609 } 610 610 … … 640 640 if (!defined($designer_name_to_id_mapping{$designer_name})) { 641 641 $designer_count++; 642 $designer_name_to_id_mapping{$designer_name} = " $designer_count";642 $designer_name_to_id_mapping{$designer_name} = "d" . $designer_count; 643 643 } 644 644 … … 652 652 # print STDERR " Designer $designer_id\n"; 653 653 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); 655 655 &new_metadata_entry($designer_doc_obj, "DocumentType", "Designer"); 656 656 … … 682 682 683 683 # 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); 685 685 } 686 686 … … 857 857 my $static_browser_package_name = shift(@_); 858 858 my $name_to_id_mapping = shift(@_); 859 my $id_prefix = shift(@_);860 859 my $table_columns = 2; 861 860 … … 894 893 895 894 my $name = $letter_names[$i]; 896 my $id = $ id_prefix . $name_to_id_mapping->{$name};895 my $id = $name_to_id_mapping->{$name}; 897 896 print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>"; 898 897 899 898 $name = $letter_names[$i+$half_point]; 900 899 if (defined($name)) { 901 $id = $ id_prefix . $name_to_id_mapping->{$name};900 $id = $name_to_id_mapping->{$name}; 902 901 print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>"; 903 902 } … … 920 919 my $name_to_id_mapping = shift(@_); 921 920 my $id_to_extra_mapping = shift(@_); 922 my $id_prefix = shift(@_); 923 my $table_columns = shift(@_); 921 my $table_columns = 2; 924 922 925 923 my $static_browser_macrofile_path = "$ENV{'GSDLHOME'}\\collect\\cic-hcap\\macros\\$static_browser_package_root.dm"; … … 960 958 print BROWSER_MACROFILE "</tr>\n"; 961 959 } 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"; 968 961 $current_letter = $1; 969 962 } … … 978 971 print BROWSER_MACROFILE "<tr>"; 979 972 } 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>"; 981 974 $current_position++; 982 975 if ($current_position == $table_columns) { … … 1001 994 my $name_to_id_mapping = shift(@_); 1002 995 my $id_to_extra_mapping = shift(@_); 1003 my $id_prefix = shift(@_); 1004 my $table_columns = shift(@_); 996 my $table_columns = 2; 1005 997 1006 998 my $static_browser_macrofile_path = "$ENV{'GSDLHOME'}\\collect\\cic-hcap\\macros\\$static_browser_package_root.dm"; … … 1047 1039 my $id = $name_to_id_mapping->{$name}; 1048 1040 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>"; 1050 1042 1051 1043 $name = $letter_names[$i+$half_point]; … … 1053 1045 $id = $name_to_id_mapping->{$name}; 1054 1046 $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>"; 1056 1048 } 1057 1049 else { … … 1170 1162 print BROWSER_MACROFILE "<tr>"; 1171 1163 } 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>"; 1173 1165 $current_position++; 1174 1166 if ($current_position == 3) {
Note:
See TracChangeset
for help on using the changeset viewer.