From 7d8851d52e1adc2adbad4cfbd4f3b5cbac5b4c0f Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sat, 8 Oct 2016 17:56:31 +0100 Subject: [PATCH] Update to ukf-members 1.4.0 Handles members.xml schema 1.7, which introduces a mandatory orgID attribute for all Grant and GrantAll elements. Move to presenting the schema from ukf-data/members to the Members constructor; this allows minor additional schema evolutions to be made without needing ukf-members to be rebuilt. utilities/2016-10-06 holds scripts used for the members.xml conversion. --- mdx/uk/beans.xml | 16 +++++++++++- tools/ukf-mda/ukf-members-1.3.0.jar | Bin 22016 -> 0 bytes tools/ukf-mda/ukf-members-1.4.0.jar | Bin 0 -> 23086 bytes utilities/2016-10-06/README.md | 25 ++++++++++++++++++ utilities/2016-10-06/gen-id-to-name.xsl | 19 ++++++++++++++ utilities/2016-10-06/patch.pl | 32 ++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 1 deletion(-) delete mode 100644 tools/ukf-mda/ukf-members-1.3.0.jar create mode 100644 tools/ukf-mda/ukf-members-1.4.0.jar create mode 100644 utilities/2016-10-06/README.md create mode 100644 utilities/2016-10-06/gen-id-to-name.xsl create mode 100755 utilities/2016-10-06/patch.pl diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml index f7b02f31..eb185e63 100644 --- a/mdx/uk/beans.xml +++ b/mdx/uk/beans.xml @@ -137,13 +137,27 @@ + + + + + + + + + + c:_0-ref="uk_membersDocument" + c:_1-ref="uk_membersSchemaDocument"/> + + diff --git a/utilities/2016-10-06/patch.pl b/utilities/2016-10-06/patch.pl new file mode 100755 index 00000000..638f5d7d --- /dev/null +++ b/utilities/2016-10-06/patch.pl @@ -0,0 +1,32 @@ +#!/usr/bin/env perl -W + +open(F, "id-to-name.txt") || die "could not open id-to-name map"; +while () { + my ($orgid, $name) = split /[\t\n]/; + #print "name='$name' --> orgid='$orgid'\n"; + $name_to_orgid{$name} = $orgid; +} +close(F); + +while (<>) { + # 12 2 3 3 1 4 4 5 5 + if (/^((.*)