Changeset 2657 for trunk

Timestamp:

2001-07-18T11:57:01+12:00 (23 years ago)

Author:

jrm21

Message:

fixed a bug when #including a macro (ie no "... or <... on the line)

File:

• trunk/gsdl/perllib/plugins/SRCPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/SRCPlug.pm

@@ -120 +120 @@
     ($title = $file) =~ s/^$self->{'remove_prefix'}//;
     } else {
-    ($title = $file) =~ s@^.*(/|\\)@@; # remove pathname by default
+    ($title = $file) =~ s@^.*[/\\]@@; # remove pathname by default
     }
     $doc_obj->add_utf8_metadata ($cursection, "Title", $title);
-    $doc_obj->add_utf8_metadata ($cursection, "filename", $file);
+    # remove the gsdl prefix from the filename
+    my $relative_filename=$file;
+    $relative_filename =~ s@^.*?gsdl[/\\]@@;
+    $doc_obj->add_utf8_metadata ($cursection, "filename", $relative_filename);
 
     # class information from .h and .cc and .C and .cpp files
@@ -166 +169 @@
     # '#  include ...'
     # '  #include ...'
-    while ($includes =~ /\#\W?include/) {
+    # also make sure it contains an actual filename, as we don't
+    # do pre-processing (eg #including a macro).
+    while ($includes =~ /\#\s*include.*(\"|<)/) {
         $includes =~ s/^.*?include.*?(\"|<)(.*)(\"|>).*$//m;
-        # $1 is now the filename between the "s.
         my $include=$2;
         # remove leading pathname