Changeset 1315 for trunk/LATMOS-Accounts/bin

Timestamp:

04/07/15 16:42:39 (9 years ago)

Author:

nanardon

Message:

merge changes

File:

• trunk/LATMOS-Accounts/bin/la-sql-upgrade.in (modified) (6 diffs)

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -6 +6 @@
 use Getopt::Long;
 use Pod::Usage;
-use Text::CSV_XS;
 
 my $DATADIR = '@DATADIR@';
@@ -23 +22 @@
     'c|config=s'     => \my $config,
     'b|base=s'       => \my $base,
-    'a|attributes=s' => \my $attributes_file,
     'no-commit'      => \my $nocommit,
     'v|verbose'      => \my $verbose,
@@ -29 +27 @@
 ) or pod2usage();
 
-$attributes_file ||= "$DATADIR/attributes.csv";
-
 =head1 OPTIONS
 
@@ -42 +38 @@
 
 Query this specific base instead of the default one.
-
-=item -a|--attribute cvs_file
-
-The attribute file description to use
 
 =back
@@ -398 +390 @@
             },
             q{
-
             CREATE TABLE service_attributes_list
             (
@@ -567 +558 @@
 }
 
-print "Loading attribute from: $attributes_file\n";
-
-open my $fh, "<:encoding(utf8)", $attributes_file or die "$attributes_file: $!"; 
- 
-my $csv = Text::CSV_XS->new(); 
- 
-while (my $row = $csv->getline($fh)) { 
-    my ($otype, $attribute, $comment) = @$row; 
-    if ($labase->is_registered_attribute($otype, $attribute)) { 
-    } else { 
-        $labase->register_attribute($otype, $attribute, $comment) 
-            or die "Error, aborting\n"; 
-        print "Attr. $attribute for object type $otype registred\n"; 
-    } 
+foreach my $otype ($labase->list_supported_objects) {
+    foreach my $attribute ($labase->list_canonical_fields($otype)) {
+        my $attr = $labase->attribute($otype, $attribute);
+        $attr->{inline} and next;
+        $attr->{managed} and next;
+
+        if ($labase->is_registered_attribute($otype, $attribute)) {
+        } else {
+            $labase->register_attribute($otype, $attribute, $attr->{comment})
+                or die "Error, aborting\n";
+            print "Attr. $attribute for object type $otype registred\n";
+        }
+    }
 } 
  
-$csv->eof or do { 
-    $csv->error_diag(); 
-    die "Cannot load attribute\n" 
-};
-
 foreach (@objects) {
     if (!$labase->get_object($_->{otype}, $_->{name})) {