[Rt-commit] [svn] r1898 - in rt/branches/3.3-TESTING: . sbin

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Mon Nov 15 04:43:23 2004
New Revision: 1898

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/sbin/rt-dump-database.in
Log:
 r4175 at not:  autrijus | 2004-11-15T09:44:43.225379Z
 * The XML-based dump format now finally round trips.
 


Modified: rt/branches/3.3-TESTING/sbin/rt-dump-database.in
==============================================================================
--- rt/branches/3.3-TESTING/sbin/rt-dump-database.in	(original)
+++ rt/branches/3.3-TESTING/sbin/rt-dump-database.in	Mon Nov 15 04:43:23 2004
@@ -74,7 +74,17 @@
     my $objects = "RT::$class"->new($RT::SystemUser);
     $objects->{find_disabled_rows} = 1;
     $objects->UnLimit;
-    $objects->OrderBy( FIELD => 'Id' );
+
+    if ($class eq 'CustomFields') {
+        $objects->OrderByCols(
+            { FIELD => 'LookupType' },
+            { FIELD => 'SortOrder' },
+            { FIELD => 'Id' },
+        );
+    }
+    else {
+        $objects->OrderBy( FIELD => 'Id' );
+    }
 
     if ($LocalOnly) {
         next if $class eq 'ACL'; # XXX - would go into infinite loop - XXX
@@ -116,7 +126,7 @@
 	    }
 	}
 
-	if ($class eq 'Users') {
+	if ($class eq 'Users' and defined $obj->Privileged) {
 	    $rv->{Privileged} = int($obj->Privileged);
 	}
 	elsif ($class eq 'CustomFields') {
@@ -145,13 +155,14 @@
 print(<< ".");
 no strict; use XML::Simple; *_ = XMLin(do { local \$/; readline(DATA) }, ForceArray => [qw(
  @classes Values
-)]); *\$_=( \$_{\$_} || [] ) for keys \%_; 1; # vim: filetype=xml
+)], NoAttr => 1, SuppressEmpty => ''); *\$_ = (\$_{\$_} || []) for keys \%_; 1; # vim: ft=xml
 __DATA__
 .
 
 print XMLout(
     { map { ($_ => ($RV{$_} || [])) } @classes },
     RootName => 'InitialData',
-    AttrIndent => 1,
+    NoAttr => 1,
+    SuppressEmpty => '',
     XMLDecl => '<?xml version="1.0" encoding="UTF-8"?>',
 );