Changeset 846

Timestamp:

1999-12-16T15:07:14+13:00 (24 years ago)

Author:

sjboddie

Message:

don't use hashdoc for now

Location:

trunk/gsdl/perllib

Files:

• basedoc.pm (modified) (6 diffs)
• doc.pm (modified) (1 diff)

trunk/gsdl/perllib/basedoc.pm

@@ -36 +36 @@
 use util;
 use html;
-use hashdoc;
+##use hashdoc;
 
 # the document type may be indexed_doc, nonindexed_doc, or
@@ -53 +53 @@
     return $self;
 }
+
+# clone the $self object
+sub duplicate {
+    my $self = shift (@_);
+
+    my $newobj = {};
+    
+    foreach $k (keys %$self) {
+    $newobj->{$k} = &clone ($self->{$k});
+    }
+
+    bless $newobj, ref($self);
+    return $newobj;
+}
+
+sub clone {
+    my ($from) = @_;
+    my $type = ref ($from);
+
+    if ($type eq "HASH") {
+    my $to = {};
+    foreach $key (keys %$from) {
+        $to->{$key} = &clone ($from->{$key});
+    }
+    return $to;
+    } elsif ($type eq "ARRAY") {
+    my $to = [];
+    foreach $v (@$from) {
+        push (@$to, &clone ($v));
+    }
+    return $to;
+    } else {
+    return $from;
+    }
+}
+
 
 sub set_source_filename {
@@ -197 +233 @@
 # current contents of the document
 # An OID are actually stored as metadata of the document
-sub set_OID_file {
+sub set_OID {
     my $self = shift (@_);
     my ($OID) = @_;
@@ -220 +256 @@
 }
 
-
-sub set_OID {
+# this uses hashdoc (embedded c thingy) which is faster but still 
+# needs a little work to be suffiently stable
+sub ___set_OID {
     my $self = shift (@_);
     my ($OID) = @_;
@@ -504 +541 @@
     my $parent_section = "";
     my $child = "0";
-    my @section = split (".", $section);
+    my @section = split (/\./, $section);
     if (scalar(@section) > 0) {
     $child = pop (@section);
@@ -713 +750 @@
 }
 
-
+sub reset_nextsection_ptr {
+    my $self = shift (@_);
+    my ($section) = @_;
+    
+    my $section_ptr = $self->_lookup_section($section);
+    $section_ptr->{'next_subsection'} = 1;
+}
 
 1;

trunk/gsdl/perllib/doc.pm

@@ -53 +53 @@
     return $self;
 }
-
-
-sub _calc_OID {
-    # included for backwards compatibility 
-    # (in particular precalculating OID in HTMLPlug)
-    return basedoc::_calc_OID(@_); 
-}
-
 
 # methods for dealing with metadata