Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mb...@re...> - 2005-03-14 14:12:36
|
Author: mbooth Date: 2005-03-14 15:10:29 +0100 (Mon, 14 Mar 2005) New Revision: 326 Added: releases/1.0.2/ccm-cms-types-minutes/ Log: Branch ccm-cms-types-minutes for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-cms-types-minutes (from rev 315, ccm-cms-types-minutes/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:12:16
|
Author: mbooth Date: 2005-03-14 15:09:56 +0100 (Mon, 14 Mar 2005) New Revision: 325 Added: releases/1.0.2/ccm-ldn-xmlfeed/ Log: Branch ccm-ldn-xmlfeed for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-ldn-xmlfeed (from rev 315, ccm-ldn-xmlfeed/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:11:23
|
Author: mbooth Date: 2005-03-14 15:09:18 +0100 (Mon, 14 Mar 2005) New Revision: 323 Added: releases/1.0.2/ccm-ldn-shortcuts/ Log: Branch ccm-ldn-shortcuts for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-ldn-shortcuts (from rev 315, ccm-ldn-shortcuts/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:11:07
|
Author: mbooth Date: 2005-03-14 15:08:51 +0100 (Mon, 14 Mar 2005) New Revision: 322 Added: releases/1.0.2/ccm-cms-types-article/ Log: Branch ccm-cms-types-article for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-cms-types-article (from rev 315, ccm-cms-types-article/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:10:29
|
Author: mbooth Date: 2005-03-14 15:08:06 +0100 (Mon, 14 Mar 2005) New Revision: 321 Added: releases/1.0.2/ccm-ldn-navigation/ Log: Branch ccm-ldn-navigation for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-ldn-navigation (from rev 315, ccm-ldn-navigation/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:10:07
|
Author: mbooth Date: 2005-03-14 15:07:54 +0100 (Mon, 14 Mar 2005) New Revision: 320 Added: releases/1.0.2/ccm-ldn-dublin/ Log: Branch ccm-ldn-dublin for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-ldn-dublin (from rev 315, ccm-ldn-dublin/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:06:41
|
Author: mbooth Date: 2005-03-14 15:04:34 +0100 (Mon, 14 Mar 2005) New Revision: 319 Added: releases/1.0.2/ccm-auth-http/ Log: Branch ccm-auth-http for APLAWS+ 1.0.2 release Copied: releases/1.0.2/ccm-auth-http (from rev 315, ccm-auth-http/trunk) |
|
From: <mb...@re...> - 2005-03-14 14:02:45
|
Author: mbooth Date: 2005-03-14 15:00:37 +0100 (Mon, 14 Mar 2005) New Revision: 318 Added: releases/1.0.2/ Log: Create 1.0.2 APLAWS+ release branch directory |
|
From: <mb...@re...> - 2005-03-14 14:02:13
|
Author: mbooth Date: 2005-03-14 14:59:31 +0100 (Mon, 14 Mar 2005) New Revision: 317 Added: releases/ Log: Create release branch directory |
|
From: <ssk...@re...> - 2005-03-14 13:22:17
|
Author: sskracic
Date: 2005-03-14 14:20:07 +0100 (Mon, 14 Mar 2005)
New Revision: 316
Modified:
ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java
Log:
A patch supplied by Christopher Gilbert from WS-GfL, retrieves the
collection of narrower terms for which this term is the default parent.
Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java
===================================================================
--- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java 2005-03-11 19:04:37 UTC (rev 315)
+++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java 2005-03-14 13:20:07 UTC (rev 316)
@@ -5,12 +5,12 @@
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -34,17 +34,17 @@
/**
* Instances of this class represent entries in a domain
* of terms.
- *
- * Although terms are currently modelled using the
+ *
+ * Although terms are currently modelled using the
* categorization service, it is not neccessarily going
- * remain this way, hence the getModel() method is
- * protected.
+ * remain this way, hence the getModel() method is
+ * protected.
*/
public class Term extends ACSObject {
private static final Logger s_log = Logger.getLogger(Term.class);
- public static final String BASE_DATA_OBJECT_TYPE =
+ public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.london.terms.Term";
public static final String UNIQUE_ID = "uniqueID";
@@ -60,7 +60,7 @@
Term() {
this(BASE_DATA_OBJECT_TYPE);
}
-
+
protected Term(String type) {
super(type);
}
@@ -71,12 +71,12 @@
public void initialize() {
super.initialize();
-
+
if (isNew()) {
set(MODEL, new Category());
}
}
-
+
/**
* Creates a new term within a domain. All
* parameters are required except for shortcut
@@ -99,29 +99,29 @@
term.setName(name);
term.setInAtoZ(inAtoZ);
- term.setShortcut(shortcut);
+ term.setShortcut(shortcut);
if (s_log.isDebugEnabled()) {
- s_log.debug("Created term " + term.getID() + " with unique id " +
+ s_log.debug("Created term " + term.getID() + " with unique id " +
uniqueID + " and name " + name + " in domain " +
domain);
}
-
+
return term;
}
-
+
private void setUniqueID(Integer uniqueID) {
Assert.exists(uniqueID, Integer.class);
set(UNIQUE_ID, uniqueID);
}
-
+
/**
* Retrieves the unique identifier for this term.
*/
public Integer getUniqueID() {
return (Integer)get(UNIQUE_ID);
}
-
+
/**
* Updates the name of this term
* @param name the term's new name
@@ -131,7 +131,7 @@
getModel().setName(name);
getModel().setURL(cleanURL(name));
}
-
+
/**
* Retrieves the name of this term
* @return the name of the term
@@ -139,7 +139,7 @@
public String getName() {
return getModel().getName();
}
-
+
/**
* Updates the description of this term
* @param description the term's new description
@@ -148,7 +148,7 @@
Assert.exists(description, String.class);
getModel().setDescription(description);
}
-
+
/**
* Retrieves the description of this term
* @return the description of the term
@@ -156,7 +156,7 @@
public String getDescription() {
return getModel().getDescription();
}
-
+
/**
* Update the flag indicating whether this
* term is suitable for inclusion in an A-Z
@@ -165,7 +165,7 @@
public void setInAtoZ(boolean inAtoZ) {
set(IN_ATOZ, new Boolean(inAtoZ));
}
-
+
/**
* Determines whether the term is suitable
* for inclusion in an A-Z
@@ -181,7 +181,7 @@
public void setShortcut(String shortcut) {
set(SHORTCUT, shortcut);
}
-
+
/**
* Retrieves the URL fragment forming a shortcut
* to this term
@@ -189,12 +189,12 @@
public String getShortcut() {
return (String)get(SHORTCUT);
}
-
+
private void setDomain(Domain domain) {
Assert.exists(domain, Domain.class);
setAssociation(DOMAIN, domain);
}
-
+
/**
* Retrieves the domain containing this term
* @return the domain containing this term
@@ -203,13 +203,13 @@
return (Domain)DomainObjectFactory
.newInstance((DataObject)get(DOMAIN));
}
-
+
public Category getModel() {
return (Category)DomainObjectFactory
.newInstance((DataObject)get(MODEL));
}
-
+
/**
* Adds a narrower term to this term
* @param term the narrower term
@@ -222,28 +222,28 @@
// "narrower term is in this domain");
if (s_log.isDebugEnabled()) {
- s_log.debug("Adding narrower term " + term + " to " +
+ s_log.debug("Adding narrower term " + term + " to " +
this + " isDefault?" + isDefault);
}
getModel().addChild(term.getModel());
term.getModel().setEnabled(isPreferred);
-
+
if (isDefault) {
term.getModel().setDefaultParentCategory(getModel());
}
}
-
+
/**
* Removes a narrower term from this term
* @param term the narrower term to remove
*/
public void removeNarrowerTerm(Term term) {
if (s_log.isDebugEnabled()) {
- s_log.debug("Removing narrower term " + term + " from " +
+ s_log.debug("Removing narrower term " + term + " from " +
this);
}
-
+
getModel().removeChild(term.getModel());
}
@@ -257,8 +257,22 @@
terms.addEqualsFilter("model.parents.link.relationType", "child");
return terms;
}
-
+
+
/**
+ * Retrieves the collection of narrower terms
+ * for which this term is the default parent
+ * @return a collection of narrower terms
+ *
+ */
+ public DomainCollection getDefaultNarrowerTerms() {
+ DomainCollection terms = getNarrowerTerms();
+ terms.addEqualsFilter("model.parents.link.isDefault", Boolean.TRUE);
+ return terms;
+ }
+
+
+ /**
* Retrieves the collection of broader terms
* @return a collection of broader terms
*/
@@ -266,9 +280,9 @@
DomainCollection terms = getDomain().getTerms();
terms.addEqualsFilter("model.related.id", getModel().getID());
terms.addEqualsFilter("model.related.link.relationType", "child");
- return terms;
+ return terms;
}
-
+
/**
* Retrieves the default broader term
* @return the default broader term
@@ -284,33 +298,33 @@
throw new DataObjectNotFoundException(
"No default broader term for " + getID());
}
-
+
/**
* Adds a related term to this term
* @param term the related term
*/
public void addRelatedTerm(Term term) {
if (s_log.isDebugEnabled()) {
- s_log.debug("Adding related term " + term + " to " +
+ s_log.debug("Adding related term " + term + " to " +
this);
}
getModel().addRelatedCategory(term.getModel());
}
-
+
/**
* Removes a related term to this term
* @param term the related term
*/
public void removeRelatedTerm(Term term) {
if (s_log.isDebugEnabled()) {
- s_log.debug("Removing related term " + term + "from " +
+ s_log.debug("Removing related term " + term + "from " +
this);
}
getModel().removeRelatedCategory(term.getModel());
}
-
+
/**
* Retrieves the related terms within this terms
* domain
@@ -322,7 +336,7 @@
terms.addEqualsFilter("model.parents.link.relationType", "related");
return terms;
}
-
+
/**
* Retrieves the related terms within this terms
* domain
@@ -355,7 +369,7 @@
public void addObject(ACSObject obj) {
getModel().addChild(obj);
}
-
+
/**
* Unclassifies an object against this term
* @param obj the object to unclassify
|
|
From: <mb...@re...> - 2005-03-11 19:06:34
|
Author: mbooth
Date: 2005-03-11 20:04:37 +0100 (Fri, 11 Mar 2005)
New Revision: 315
Modified:
ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionWrapper.java
ccm-core/trunk/src/com/arsdigita/formbuilder/CompoundComponent.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentComponent.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentContainer.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentSubmit.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentText.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseEditAddObserver.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java
Log:
Display components of a formsection in TemplateEmailForm controls widget.
Required refactorisation to allow components to be retrieved from CompoundComponent.
Modified: ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionWrapper.java
===================================================================
--- ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionWrapper.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionWrapper.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -32,6 +32,7 @@
import org.apache.log4j.Logger;
import java.math.BigDecimal;
+import java.util.Iterator;
public class FormSectionWrapper extends PersistentComponent
implements CompoundComponent {
@@ -147,24 +148,6 @@
return section.createComponent();
}
- /*
- public void save() {
- super.save();
- }
-
- public void delete() {
- super.delete();
- }
-
- public BigDecimal getID() {
- super.getID();
- }
-
- public boolean isNew() {
- super.isNew();
- }
- */
-
public void addComponent(PersistentComponent component) {
FormSectionItem item = getFormSectionItem();
Assert.exists(item, FormSectionItem.class);
@@ -196,4 +179,12 @@
Assert.exists(item, FormSectionItem.class);
item.getFormSection().clearComponents();
}
+
+ public Iterator getComponentsIter() {
+ return getFormSectionItem().getFormSection().getComponentsIter();
+ }
+
+ public boolean isEditable() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/CompoundComponent.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/CompoundComponent.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/CompoundComponent.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -18,9 +18,16 @@
*/
package com.arsdigita.formbuilder;
+import java.util.Iterator;
+/**
+ * A CompoundComponent is a container of components which should themselves be
+ * treated like top level components. FormSection is an example of this.
+ */
+
public interface CompoundComponent {
public void setComponentAddObserver(ComponentAddObserver observer);
+ public Iterator getComponentsIter();
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentComponent.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentComponent.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentComponent.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -230,4 +230,21 @@
return list;
}
+
+ // Metadata for authoring
+
+ /**
+ * Is this object editable after creation? eg A form section isn't, you must
+ * edit the target item.
+ */
+ public boolean isEditable() {
+ return true;
+ }
+
+ /**
+ * Does this widget have an associated label? eg A horizontal rule doesn't.
+ */
+ public boolean hasLabel() {
+ return true;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentContainer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentContainer.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentContainer.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -18,9 +18,8 @@
*/
package com.arsdigita.formbuilder;
+import java.util.Iterator;
-
-
/**
* Implemented by classes that contain persistent Bebop components. The
* components are added via their corresponding PersistentComponent that
@@ -69,4 +68,9 @@
* Delete all component associations from this container
*/
public void clearComponents();
+
+ /**
+ * Return an Iterator over all components in the container
+ */
+ public Iterator getComponentsIter();
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -33,9 +33,9 @@
import com.arsdigita.persistence.metadata.ObjectType;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.ArrayList;
import org.apache.log4j.Logger;
@@ -240,6 +240,13 @@
return m_container.getComponents();
}
+ /**
+ * Return an Iterator over all child components
+ */
+ public Iterator getComponentsIter() {
+ return m_container.getComponentsIter();
+ }
+
// *** Internal Helper Methods
/**
@@ -397,4 +404,8 @@
public Container getFormContainer() {
return m_form_container;
}
+
+ public boolean isEditable() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -92,4 +92,8 @@
public Component createComponent() {
return new HorizontalLine();
}
+
+ public boolean hasLabel() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentSubmit.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentSubmit.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentSubmit.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -166,4 +166,8 @@
public String getButtonLabel() {
return (String)getDefaultValue();
}
+
+ public boolean hasLabel() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentText.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentText.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentText.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -139,4 +139,8 @@
public String getText() {
return getDescription();
}
+
+ public boolean hasLabel() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -45,14 +45,12 @@
PersistentComponent component,
int componentPosition) {
// Padding
- if (component instanceof PersistentSubmit ||
- component instanceof PersistentText ||
- component instanceof PersistentHorizontalRule) {
+ if (!component.hasLabel()) {
formSection.add(new Label(""));
}
// Make sure we process nested form sections
- if( component instanceof CompoundComponent ) {
+ if (component instanceof CompoundComponent) {
CompoundComponent fs = (CompoundComponent)component;
fs.setComponentAddObserver(new BaseAddObserver());
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseEditAddObserver.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseEditAddObserver.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseEditAddObserver.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -30,6 +30,7 @@
import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.Label;
+import org.apache.log4j.Logger;
/**
* This is an extension of the BaseAddObserver which
@@ -37,6 +38,8 @@
* adding additional links on each row.
*/
public abstract class BaseEditAddObserver extends BaseAddObserver {
+ private static final Logger s_log =
+ Logger.getLogger(BaseEditAddObserver.class);
public void beforeAddingComponent(FormSection formSection,
PersistentComponent component,
@@ -79,7 +82,10 @@
if(!(component instanceof PersistentLabel)) {
BoxPanel b = new BoxPanel(BoxPanel.HORIZONTAL);
- if (!(component instanceof CompoundComponent)) {
+ if (s_log.isDebugEnabled())
+ s_log.debug("Adding widget " + component.getClass().getName());
+
+ if (component.isEditable()) {
BaseLink edit = createLink("edit", component);
b.add(edit);
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -18,6 +18,7 @@
*/
package com.arsdigita.formbuilder.ui.editors;
+import com.arsdigita.formbuilder.CompoundComponent;
import com.arsdigita.formbuilder.PersistentComponent;
import com.arsdigita.formbuilder.PersistentFormSection;
import com.arsdigita.formbuilder.PersistentProcessListener;
@@ -120,21 +121,7 @@
PersistentFormSection form = (PersistentFormSection)
DomainObjectFactory.newInstance( formOID );
- DataAssociationCursor components = form.getComponents();
- while( components.next() ) {
- PersistentComponent c = (PersistentComponent)
- DomainObjectFactory.newInstance( components.getDataObject() );
-
- if( c instanceof PersistentWidget ) {
- PersistentWidget w = (PersistentWidget) c;
-
- if (!"::user.email::".equals(w.getParameterName())) {
- String parameter = "::form." +
- w.getParameterName() + "::";
- m_controls.addOption(new Option(parameter, w.getParameterName()), ps);
- }
- }
- }
+ addComponents(ps, form.getComponentsIter(), m_controls);
}
});
} catch (TooManyListenersException ex) {
@@ -147,6 +134,26 @@
section.add(m_body);
}
+ private void addComponents(PageState ps, Iterator components,
+ SingleSelect controls) {
+ while( components.hasNext() ) {
+ PersistentComponent c = (PersistentComponent) components.next();
+
+ if( c instanceof PersistentWidget ) {
+ PersistentWidget w = (PersistentWidget) c;
+
+ if (!"::user.email::".equals(w.getParameterName())) {
+ String parameter = "::form." +
+ w.getParameterName() + "::";
+ controls.addOption(new Option(parameter, w.getParameterName()), ps);
+ }
+ } else if (c instanceof CompoundComponent) {
+ CompoundComponent compound = (CompoundComponent) c;
+ addComponents(ps, compound.getComponentsIter(), controls);
+ }
+ }
+ }
+
protected PersistentProcessListener getProcessListener() {
return new TemplateEmailListener();
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -310,7 +310,8 @@
*/
//m_name.setVisible(state, false);
- m_required.setValue( state, new Boolean( widget.isRequired() ) );
+ if(includeRequiredRadioGroup())
+ m_required.setValue(state, new Boolean(widget.isRequired()));
}
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java 2005-03-11 18:26:14 UTC (rev 314)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java 2005-03-11 19:04:37 UTC (rev 315)
@@ -19,11 +19,8 @@
package com.arsdigita.formbuilder.util;
-import java.math.BigDecimal;
-
import com.arsdigita.formbuilder.PersistentComponent;
import com.arsdigita.formbuilder.PersistentContainer;
-import com.arsdigita.formbuilder.util.FormBuilderUtil;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainServiceInterfaceExposer;
@@ -34,12 +31,10 @@
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.DataOperation;
-// Child components are returned in a collection
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
+import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
-// ACS 5 uses Log4J for logging
import org.apache.log4j.Logger;
@@ -67,8 +62,6 @@
// We are using lazy initialization here
private int m_numberOfComponents = -1;
- private List m_selectedComponents = new ArrayList();
-
public PersistentContainerHelper(PersistentComponent component) {
m_component = component;
@@ -354,4 +347,44 @@
// Decrement the counter
--m_numberOfComponents;
}
+
+ public Iterator getComponentsIter() {
+ class DACIterator implements Iterator {
+ boolean m_hasNext = false;
+ Object m_obj = null;
+ DataAssociationCursor m_cursor;
+
+ DACIterator(DataAssociationCursor cursor) {
+ m_cursor = cursor;
+ iterate();
+ }
+
+ public boolean hasNext() {
+ return m_hasNext;
+ }
+
+ public Object next() {
+ if (!m_hasNext) throw new NoSuchElementException();
+
+ Object next = m_obj;
+ iterate();
+ return next;
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void iterate() {
+ m_hasNext = m_cursor.next();
+ if (m_hasNext) {
+ m_obj = DomainObjectFactory.newInstance(m_cursor.getDataObject());
+ } else {
+ m_obj = null;
+ }
+ }
+ };
+
+ return new DACIterator(getComponents());
+ }
}
|
|
From: <mb...@re...> - 2005-03-11 18:28:15
|
Author: mbooth
Date: 2005-03-11 19:26:14 +0100 (Fri, 11 Mar 2005)
New Revision: 314
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
Log:
Make UserEmailForm work as intended
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2005-03-04 16:56:07 UTC (rev 313)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2005-03-11 18:26:14 UTC (rev 314)
@@ -154,16 +154,19 @@
Placeholders p = new Placeholders(getForm(), e.getFormData());
- User user = (User) Kernel.getContext().getParty();
- if( null == user ) {
- s_log.info( "User not logged in. Not sending confirmation" );
- return;
+ String to = (String) p.interpolate("::user.email::");
+ if (null == to) {
+ User user = (User) Kernel.getContext().getParty();
+ if( null == user ) {
+ s_log.info( "User not logged in. Not sending confirmation" );
+ } else {
+ to = user.getPrimaryEmail().getEmailAddress();
+ }
}
String from = p.interpolate(m_from);
String subject = p.interpolate(m_subject);
String body = p.interpolate(m_body);
- String to = user.getPrimaryEmail().getEmailAddress();
try {
Mail message = new Mail(to, from, subject, body);
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-03-04 16:56:07 UTC (rev 313)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-03-11 18:26:14 UTC (rev 314)
@@ -159,12 +159,14 @@
String subject = p.interpolate(m_subject);
- User user = (User) Kernel.getContext().getParty();
- String from;
- if( null == user ) {
- from = Mail.getConfig().getDefaultFrom();
- } else {
- from = user.getPrimaryEmail().getEmailAddress();
+ String from = (String) p.interpolate("::user.email::");
+ if (null == from) {
+ User user = (User) Kernel.getContext().getParty();
+ if( null == user ) {
+ from = Mail.getConfig().getDefaultFrom();
+ } else {
+ from = user.getPrimaryEmail().getEmailAddress();
+ }
}
StringBuffer body = new StringBuffer();
|
|
From: <ap...@re...> - 2005-03-04 16:57:57
|
Author: apevec
Date: 2005-03-04 17:56:07 +0100 (Fri, 04 Mar 2005)
New Revision: 313
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java
Log:
do not send end date as String to the DB, Persistence can handle Date parameters
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java 2005-02-28 11:44:43 UTC (rev 312)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java 2005-03-04 16:56:07 UTC (rev 313)
@@ -131,7 +131,7 @@
Calendar now = Calendar.getInstance();
now.add(Calendar.DAY_OF_YEAR, 1);
- query.setParameter("endDateTime", now.getTime().toString());
+ query.setParameter("endDateTime", now.getTime());
ContentSection section = CMS.getContext().getContentSection();
query.setParameter("sectionId", section.getID());
|
|
From: <mb...@re...> - 2005-02-28 11:46:15
|
Author: mbooth
Date: 2005-02-28 12:44:43 +0100 (Mon, 28 Feb 2005)
New Revision: 312
Modified:
ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataQueries.pdl
Log:
Given that the results of the formbuilder user query are user facing, IDs aren't terribly helpful. Output full name and email address instead.
Modified: ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataQueries.pdl
===================================================================
--- ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataQueries.pdl 2005-02-28 11:40:42 UTC (rev 311)
+++ ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataQueries.pdl 2005-02-28 11:44:43 UTC (rev 312)
@@ -21,17 +21,18 @@
query DataQueryUsers {
- BigDecimal id;
+ String id;
String label;
do {
- select u.user_id,
+ select n.given_name || ' ' || n.family_name || ' <' || p.primary_email || '>' id,
n.given_name || ' ' || n.family_name as full_name
- from users u, person_names n
+ from users u, person_names n, parties p
where u.name_id = n.name_id
+ and p.party_id = u.user_id
order by full_name asc
} map {
- id = u.user_id;
+ id = id;
label = full_name;
}
}
|
|
From: <mb...@re...> - 2005-02-28 11:42:07
|
Author: mbooth
Date: 2005-02-28 12:40:42 +0100 (Mon, 28 Feb 2005)
New Revision: 311
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
Log:
Always print a newline, even for null values.
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-02-28 11:11:51 UTC (rev 310)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-02-28 11:40:42 UTC (rev 311)
@@ -207,9 +207,9 @@
} else {
body.append( value.toString() );
}
+ }
- body.append( '\n' );
- }
+ body.append( '\n' );
}
}
}
|
|
From: <mb...@re...> - 2005-02-28 11:13:22
|
Author: mbooth
Date: 2005-02-28 12:11:51 +0100 (Mon, 28 Feb 2005)
New Revision: 310
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmRedirectListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmRedirectForm.java
Log:
Don't use DispatcherHelper to send redirect. Add validation listener to URL to prevent entry of an invalid redirect URL.
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmRedirectListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmRedirectListener.java 2005-02-28 11:10:00 UTC (rev 309)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmRedirectListener.java 2005-02-28 11:11:51 UTC (rev 310)
@@ -18,20 +18,16 @@
*/
package com.arsdigita.formbuilder.actions;
+import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
-import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.web.RedirectSignal;
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.FormSectionEvent;
-
import com.arsdigita.formbuilder.PersistentProcessListener;
import java.math.BigDecimal;
-import com.arsdigita.bebop.event.FormProcessListener;
-import com.arsdigita.dispatcher.DispatcherHelper;
-import com.arsdigita.util.UncheckedWrapperException;
public class ConfirmRedirectListener extends PersistentProcessListener {
public static final String BASE_DATA_OBJECT_TYPE =
@@ -55,15 +51,11 @@
super(obj);
}
- public ConfirmRedirectListener(BigDecimal id)
- throws DataObjectNotFoundException {
-
+ public ConfirmRedirectListener(BigDecimal id) {
this(new OID(BASE_DATA_OBJECT_TYPE, id));
}
- public ConfirmRedirectListener(OID oid)
- throws DataObjectNotFoundException {
-
+ public ConfirmRedirectListener(OID oid) {
super(oid);
}
@@ -112,14 +104,8 @@
m_url = url;
}
- public void process(FormSectionEvent e)
- throws FormProcessException {
-
- try {
- DispatcherHelper.sendExternalRedirect(e.getPageState().getResponse(), m_url);
- } catch (java.io.IOException ex) {
- throw new UncheckedWrapperException("Cannot do redirect", ex);
- }
+ public void process(FormSectionEvent e) {
+ throw new RedirectSignal(m_url, true);
}
}
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmRedirectForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmRedirectForm.java 2005-02-28 11:10:00 UTC (rev 309)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmRedirectForm.java 2005-02-28 11:11:51 UTC (rev 310)
@@ -16,39 +16,31 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.formbuilder.ui.editors;
-
-import com.arsdigita.formbuilder.util.GlobalizationUtil ;
-
-
+import com.arsdigita.formbuilder.PersistentProcessListener;
import com.arsdigita.formbuilder.actions.ConfirmRedirectListener;
+import com.arsdigita.formbuilder.util.GlobalizationUtil;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.PageState;
-
import com.arsdigita.bebop.event.FormSectionEvent;
-
+import com.arsdigita.bebop.event.ParameterEvent;
+import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.form.TextField;
-
+import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.ParameterData;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
import com.arsdigita.bebop.parameters.URLParameter;
-import com.arsdigita.domain.DataObjectNotFoundException;
-
-
-
import java.math.BigDecimal;
-import com.arsdigita.bebop.SingleSelectionModel;
-import com.arsdigita.formbuilder.PersistentProcessListener;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
-import com.arsdigita.bebop.ColumnPanel;
-
-
public class ConfirmRedirectForm extends ProcessListenerForm {
private TextField m_url;
@@ -65,6 +57,24 @@
m_url.setSize(50);
m_url.addValidationListener(new NotNullValidationListener());
m_url.addValidationListener(new StringInRangeValidationListener(1, 160));
+ m_url.addValidationListener(new ParameterListener() {
+ // Ensure that the URL is either fully qualified, or an absolute
+ // path.
+ public void validate(ParameterEvent ev)
+ throws FormProcessException
+ {
+ ParameterData data = ev.getParameterData();
+ String value = (String) data.getValue();
+
+ if (null == value) return;
+ if (value.indexOf("://") != -1) return;
+ if (value.startsWith("/")) return;
+
+ data.addError("URL must be either fully qualified, eg http://www.google.co.uk/, or an absolute path, eg /ccm/portal. Relative paths, eg admin/index.jsp, are not allowed.");
+ }
+ });
+
+
section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.url")), ColumnPanel.RIGHT);
section.add(m_url);
}
@@ -74,9 +84,7 @@
return new ConfirmRedirectListener();
}
- protected PersistentProcessListener getProcessListener(BigDecimal id)
- throws DataObjectNotFoundException {
-
+ protected PersistentProcessListener getProcessListener(BigDecimal id) {
return new ConfirmRedirectListener(id);
}
|
|
From: <mb...@re...> - 2005-02-28 11:11:28
|
Author: mbooth Date: 2005-02-28 12:10:00 +0100 (Mon, 28 Feb 2005) New Revision: 309 Modified: ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherHelper.java Log: Fix bug in sendExternalRedirect when url doesn't have a trailing slash after host name, eg "http://www.google.co.uk" Modified: ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherHelper.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherHelper.java 2005-02-28 11:08:54 UTC (rev 308) +++ ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherHelper.java 2005-02-28 11:10:00 UTC (rev 309) @@ -600,7 +600,7 @@ if (url.startsWith("http")) { final int start = url.indexOf("/", url.indexOf("//") + 2); - final String path = url.substring(start); + final String path = start >= 0 ? url.substring(start) : "/"; if (!path.startsWith(URL.getDispatcherPath())) { url = path; |
|
From: <mb...@re...> - 2005-02-28 11:10:28
|
Author: mbooth
Date: 2005-02-28 12:08:54 +0100 (Mon, 28 Feb 2005)
New Revision: 308
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmEmailForm.java
Log:
Cleanup imports and remove use of DataObjectNotFoundException
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmEmailForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmEmailForm.java 2005-02-25 16:30:01 UTC (rev 307)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/ConfirmEmailForm.java 2005-02-28 11:08:54 UTC (rev 308)
@@ -18,39 +18,27 @@
*/
package com.arsdigita.formbuilder.ui.editors;
-
+import com.arsdigita.formbuilder.PersistentProcessListener;
+import com.arsdigita.formbuilder.actions.ConfirmEmailListener;
import com.arsdigita.formbuilder.util.GlobalizationUtil ;
-
-import com.arsdigita.formbuilder.actions.ConfirmEmailListener;
-
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState;
-
+import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.event.FormSectionEvent;
-
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
-
+import com.arsdigita.bebop.parameters.EmailParameter;
+import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.domain.DataObjectNotFoundException;
-
-
-
import java.math.BigDecimal;
-import com.arsdigita.bebop.SingleSelectionModel;
-import com.arsdigita.formbuilder.PersistentProcessListener;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.parameters.EmailParameter;
-import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
-import com.arsdigita.bebop.ColumnPanel;
-
-
public class ConfirmEmailForm extends ProcessListenerForm {
private TextField m_from;
private TextField m_subject;
@@ -92,9 +80,7 @@
return new ConfirmEmailListener();
}
- protected PersistentProcessListener getProcessListener(BigDecimal id)
- throws DataObjectNotFoundException {
-
+ protected PersistentProcessListener getProcessListener(BigDecimal id) {
return new ConfirmEmailListener(id);
}
|
|
From: <mb...@re...> - 2005-02-25 16:31:24
|
Author: mbooth
Date: 2005-02-25 17:30:01 +0100 (Fri, 25 Feb 2005)
New Revision: 307
Modified:
ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
Output eGMS.subject.interaction in default APLAWS styling
Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
===================================================================
--- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-02-25 16:20:27 UTC (rev 306)
+++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-02-25 16:30:01 UTC (rev 307)
@@ -341,6 +341,9 @@
<xsl:when test="@domain='LGSL'">
<meta name="eGMS.subject.service" content="{@id}" scheme="LGSL" href="http://www.esd.org.uk/standards/lgsl/lgsl.xml" />
</xsl:when>
+<xsl:when test="@domain='LGIL'">
+<meta name="eGMS.subject.interaction" content="{@name}" scheme="LGIL" href="http://www.esd.org.uk/standards/lgil/lgil.xml" />
+</xsl:when>
</xsl:choose>
</xsl:for-each>
|
|
From: <mb...@re...> - 2005-02-25 16:21:45
|
Author: mbooth
Date: 2005-02-25 17:20:27 +0100 (Fri, 25 Feb 2005)
New Revision: 306
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java
Log:
Don't NPE if asked to fetch categories for a non existant use context. Just
display a warning in the log and return nothing.
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java 2005-02-25 16:13:12 UTC (rev 305)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java 2005-02-25 16:20:27 UTC (rev 306)
@@ -60,6 +60,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
@@ -1388,6 +1389,13 @@
Category root = Category.getRootForObject(getContentSection(), useContext);
+ if (null == root) {
+ s_log.warn("No root category for " +
+ getContentSection().getOID().toString() +
+ " with context " + useContext);
+ return Collections.EMPTY_LIST.iterator();
+ }
+
CategoryCollection cats = root.getDescendants();
cats.addEqualsFilter("childObjects.id", getID());
|
|
From: <mb...@re...> - 2005-02-25 16:14:37
|
Author: mbooth
Date: 2005-02-25 17:13:12 +0100 (Fri, 25 Feb 2005)
New Revision: 305
Modified:
ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreSummary.java
Log:
Display interaction categories in metadata summary
Modified: ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreSummary.java
===================================================================
--- ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreSummary.java 2005-02-25 15:40:41 UTC (rev 304)
+++ ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreSummary.java 2005-02-25 16:13:12 UTC (rev 305)
@@ -68,6 +68,7 @@
private Label m_language;
private Label m_coverageSpatialRef;
private List m_categories;
+ private List m_interaction;
private Label m_keywords;
private ItemSelectionModel m_itemModel;
@@ -110,14 +111,14 @@
m_keywords = new Label();
- m_categories = new List(new CategoryListModelBuilder(itemModel));
- m_categories.setCellRenderer(new ListCellRenderer() {
- public Component getComponent(List list, PageState state, Object value,
- String key, int index, boolean isSelected) {
+ ListCellRenderer simpleCellRenderer = new SimpleCellRenderer();
+ m_categories = new List(new CategoryListModelBuilder(itemModel,
+ "subject"));
+ m_categories.setCellRenderer(simpleCellRenderer);
- return new Label(value.toString());
- }
- });
+ m_interaction = new List(new CategoryListModelBuilder(itemModel,
+ "interaction"));
+ m_interaction.setCellRenderer(simpleCellRenderer);
add(new Label("Title:", Label.BOLD),
ColumnPanel.RIGHT);
@@ -206,6 +207,10 @@
add(new Label("Subject Categories:", Label.BOLD),
ColumnPanel.RIGHT | ColumnPanel.TOP);
add(m_categories);
+
+ add(new Label("Interaction:", Label.BOLD),
+ ColumnPanel.RIGHT | ColumnPanel.TOP);
+ add(m_interaction);
}
public void generateXML(PageState state,
@@ -282,14 +287,25 @@
implements ListModelBuilder
{
private ItemSelectionModel m_itemModel;
+ private String m_context;
- public CategoryListModelBuilder( ItemSelectionModel itemModel ) {
+ public CategoryListModelBuilder(ItemSelectionModel itemModel,
+ String context) {
m_itemModel = itemModel;
+ m_context = context;
}
public ListModel makeModel( List l, PageState state ) {
ContentPage item = (ContentPage) m_itemModel.getSelectedObject(state);
- return new CategoryIteratorListModel(item.getCategories("subject"));
+ return new CategoryIteratorListModel(item.getCategories(m_context));
}
}
+
+ protected class SimpleCellRenderer implements ListCellRenderer {
+ public Component getComponent(List list, PageState state, Object value,
+ String key, int index,
+ boolean isSelected) {
+ return new Label(value.toString());
+ }
+ };
}
|
Author: mbooth Date: 2005-02-25 16:40:41 +0100 (Fri, 25 Feb 2005) New Revision: 304 Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgil-0.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java ccm-ldn-terms/trunk/doc/esd/files-1.04.txt ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl Log: Add the LGIL Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgil-0.01.xml =================================================================== --- ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgil-0.01.xml 2005-02-25 12:57:19 UTC (rev 303) +++ ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgil-0.01.xml 2005-02-25 15:40:41 UTC (rev 304) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.esd.org.uk/standards/lgil/2.00/lgil.xml" key="LGIL" title="Local Government Interaction Type List" version="0.01" released="2004-04-01"> + <terms:term id="0" name="Applications for service" inAtoZ="false"/> + <terms:term id="1" name="Booking venues, resources and courses" inAtoZ="false"/> + <terms:term id="2" name="Collecting revenue" inAtoZ="false"/> + <terms:term id="3" name="Consultation" inAtoZ="false"/> + <terms:term id="4" name="Paying for goods and services" inAtoZ="false"/> + <terms:term id="5" name="Procurement" inAtoZ="false"/> + <terms:term id="6" name="Providing access to community, professionals or business networks" inAtoZ="false"/> + <terms:term id="7" name="Providing benefits and grants" inAtoZ="false"/> + <terms:term id="8" name="Providing information" inAtoZ="false"/> + <terms:term id="9" name="Regulation" inAtoZ="false"/> + <terms:term id="10" name="Appealing" inAtoZ="false"/> + <terms:term id="11" name="Changes in circumstances" inAtoZ="false"/> + <terms:term id="12" name="Checking status" inAtoZ="false"/> + <terms:term id="13" name="Complaints" inAtoZ="false"/> + <terms:term id="14" name="Renewing" inAtoZ="false"/> + <terms:term id="15" name="Repairing" inAtoZ="false"/> + <terms:term id="16" name="Replacing" inAtoZ="false"/> + <terms:term id="17" name="Reporting" inAtoZ="false"/> + <terms:term id="18" name="Entitlement checking" inAtoZ="false"/> + <terms:term id="19" name="Registration and Licensing" inAtoZ="false"/> +</terms:domain> Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml =================================================================== --- ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml 2005-02-25 12:57:19 UTC (rev 303) +++ ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml 2005-02-25 15:40:41 UTC (rev 304) @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"> + <terms:domain resource="http://www.esd.org.uk/standards/lgil/2.00/lgil.xml"/> + <terms:term id="0"/> + <terms:term id="1"/> + <terms:term id="2"/> + <terms:term id="3"/> + <terms:term id="4"/> + <terms:term id="5"/> + <terms:term id="6"/> + <terms:term id="7"/> + <terms:term id="8"/> + <terms:term id="9"/> + <terms:term id="10"/> + <terms:term id="11"/> + <terms:term id="12"/> + <terms:term id="13"/> + <terms:term id="14"/> + <terms:term id="15"/> + <terms:term id="16"/> + <terms:term id="17"/> + <terms:term id="18"/> + <terms:term id="19"/> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="10"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="11"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="12"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="13"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="14"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="15"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="16"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="0"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="17"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="7"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="18"/> + </terms:destination> + </terms:orderedPair> + <terms:orderedPair> + <terms:source> + <terms:term id="9"/> + </terms:source> + <terms:destination isDefault="true" isPreferred="true"> + <terms:term id="19"/> + </terms:destination> + </terms:orderedPair> +</terms:hierarchy> Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java =================================================================== --- ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java 2005-02-25 12:57:19 UTC (rev 303) +++ ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java 2005-02-25 15:40:41 UTC (rev 304) @@ -78,10 +78,12 @@ "WEB-INF/esd-toolkit/domain-gcl-2.10.xml", "WEB-INF/esd-toolkit/domain-lgcl-1.04.xml", "WEB-INF/esd-toolkit/domain-lgdl-2.01.xml", + "WEB-INF/esd-toolkit/domain-lgil-0.01.xml", "WEB-INF/esd-toolkit/domain-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgcl-1.04.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01.xml", + "WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml", "WEB-INF/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml", "WEB-INF/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml", "WEB-INF/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml", @@ -96,10 +98,12 @@ "WEB-INF/esd-toolkit/domain-gcl-2.10.xml", "WEB-INF/esd-toolkit/domain-lgcl-lite-1.04.xml", "WEB-INF/esd-toolkit/domain-lgdl-2.01.xml", + "WEB-INF/esd-toolkit/domain-lgil-0.01.xml", "WEB-INF/esd-toolkit/domain-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgcl-lite-1.04.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01.xml", + "WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml", "WEB-INF/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml", "WEB-INF/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml", "WEB-INF/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml", @@ -112,6 +116,7 @@ private StringParameter m_servicesDomain; private StringParameter m_navigationDomain; + private StringParameter m_interactionDomain; private StringParameter m_subjectDomain; private StringParameter m_rssDomain; private BooleanParameter m_liteLoad; @@ -137,6 +142,11 @@ "com.arsdigita.aplaws.subject_domain", Parameter.REQUIRED, "LGCL"); + + m_interactionDomain = new StringParameter( + "com.arsdigita.aplaws.subject_domain", + Parameter.REQUIRED, + "LGIL"); m_rssDomain = new StringParameter( "com.arsdigita.aplaws.rss_domain", @@ -185,6 +195,7 @@ register(m_servicesDomain); register(m_navigationDomain); + register(m_interactionDomain); register(m_subjectDomain); register(m_rssDomain); register(m_liteLoad); @@ -226,6 +237,7 @@ } String navigationKey = (String)get(m_navigationDomain); + String interactionKey = (String)get(m_interactionDomain); String servicesKey = (String)get(m_servicesDomain); String subjectKey = (String)get(m_subjectDomain); String rssKey = (String)get(m_rssDomain); @@ -235,6 +247,9 @@ registerDomain(navigationKey, "/forms/", null); registerDomain(navigationKey, "/portal/", null); + registerDomain(interactionKey, "/content/", null); + registerDomain(interactionKey, "/forms/", null); + registerDomain(subjectKey, "/search/", null); registerDomain(subjectKey, "/content/", "subject"); registerDomain(subjectKey, "/forms/", "subject"); Modified: ccm-ldn-terms/trunk/doc/esd/files-1.04.txt =================================================================== --- ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-02-25 12:57:19 UTC (rev 303) +++ ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-02-25 15:40:41 UTC (rev 304) @@ -15,3 +15,5 @@ http://www.esd.org.uk/standards/lgcl/1.04/lgcllgslmapping.xml,mapping-lgsl-2.00-lgcl-1.04.xml,xslt-1.04/Mapping2reversemapping.xsl http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,domain-lgcl-lite-1.04.xml,xslt-1.04/ItemsHierarchy2domainLite.xsl http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,hierarchy-lgcl-lite-1.04.xml,xslt-1.04/ItemsHierarchy2hierarchyLite.xsl +http://www.esd.org.uk/standards/lgil/lgil.xml,domain-lgil-0.01.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/lgil/lgil.xml,hierarchy-lgil-0.01.xml,xslt-1.04/ControlledList2hierarchy.xsl Modified: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-02-25 12:57:19 UTC (rev 303) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-02-25 15:40:41 UTC (rev 304) @@ -9,7 +9,7 @@ <terms:hierarchy> <terms:domain resource="{@HomeLocation}"/> <xsl:apply-templates select="esd:Item"/> - + <xsl:apply-templates select="esd:Item/esd:BroaderItem"/> </terms:hierarchy> </xsl:template> @@ -17,4 +17,19 @@ <terms:term id="{@Id}"/> </xsl:template> + <xsl:template match="esd:BroaderItem"> + <terms:orderedPair> + <terms:source> + <terms:term id="{@Id}"/> + </terms:source> + <!-- + isPreferred is hardcoded to true here. This is what + we need for LGIL, and nothing else uses this. + --> + <terms:destination isDefault="{@Default}" isPreferred="true"> + <terms:term id="{../@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:template> + </xsl:stylesheet> |
|
From: <mb...@re...> - 2005-02-25 12:58:39
|
Author: mbooth Date: 2005-02-25 13:57:19 +0100 (Fri, 25 Feb 2005) New Revision: 303 Modified: ccm-cms-types-htmlform/trunk/ ccm-user-preferences/trunk/ Log: Ignore build directories Property changes on: ccm-cms-types-htmlform/trunk ___________________________________________________________________ Name: svn:ignore + build Property changes on: ccm-user-preferences/trunk ___________________________________________________________________ Name: svn:ignore + build |
|
From: <mb...@re...> - 2005-02-25 12:56:33
|
Author: mbooth Date: 2005-02-25 13:54:54 +0100 (Fri, 25 Feb 2005) New Revision: 302 Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.10.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgcl-1.04.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgcl-lite-1.04.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgdl-2.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgsl-2.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgcl-1.04.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgcl-lite-1.04.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgdl-2.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/related-lgcl-1.04.xml Removed: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-acl-1.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.0.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgal-0.01.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgcl-1.03.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgcl-lite-1.03.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgdl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgsl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-gcl-2.0.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgcl-1.03.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgcl-lite-1.03.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgdl-2.00-lgsl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgdl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgcl-1.03-acl-1.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgcl-1.03-gcl-2.0.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgcl-1.03-lgsl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/mapping-lgdl-2.00-lgsl-2.00.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/related-lgcl-1.03.xml Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java Log: Change APLAWS to use version 1.04 category lists Deleted: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-acl-1.00.xml Deleted: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.0.xml Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.10.xml =================================================================== --- ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.10.xml 2005-02-25 12:53:52 UTC (rev 301) +++ ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-gcl-2.10.xml 2005-02-25 12:54:54 UTC (rev 302) @@ -0,0 +1,1816 @@ +<?xml version="1.0"?> +<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.esd.org.uk/standards/gcl/2.10/gcltermslist.xml" key="GCL" title="Government Category List" version="2.10" released="2004-08-12"> + <terms:term id="1" name="Environmental monitoring" inAtoZ="false"/> + <terms:term id="2" name="Air quality monitoring" inAtoZ="false"/> + <terms:term id="4" name="Air pollution" inAtoZ="false"/> + <terms:term id="5" name="Water pollution" inAtoZ="false"/> + <terms:term id="6" name="Land contamination" inAtoZ="false"/> + <terms:term id="7" name="Effluents" inAtoZ="false"/> + <terms:term id="8" name="Toxic waste" inAtoZ="false"/> + <terms:term id="9" name="Property (land)" inAtoZ="false"/> + <terms:term id="10" name="Local development plans" inAtoZ="false"/> + <terms:term id="11" name="Property planning (land or buildings)" inAtoZ="false"/> + <terms:term id="12" name="Planning applications" inAtoZ="false"/> + <terms:term id="13" name="Compulsory purchase orders (land)" inAtoZ="false"/> + <terms:term id="15" name="Trees" inAtoZ="false"/> + <terms:term id="16" name="Sewage treatment and disposal" inAtoZ="false"/> + <terms:term id="17" name="Sewage disposal" inAtoZ="false"/> + <terms:term id="18" name="Septic tanks" inAtoZ="false"/> + <terms:term id="19" name="Cesspits" inAtoZ="false"/> + <terms:term id="20" name="Composting" inAtoZ="false"/> + <terms:term id="21" name="Dustbin collection" inAtoZ="false"/> + <terms:term id="22" name="Effluent treatment" inAtoZ="false"/> + <terms:term id="23" name="Green box collection" inAtoZ="false"/> + <terms:term id="24" name="Animal breeding (farm)" inAtoZ="false"/> + <terms:term id="25" name="Poultry farming" inAtoZ="false"/> + <terms:term id="26" name="Bee-keeping" inAtoZ="false"/> + <terms:term id="27" name="Intensive farming" inAtoZ="false"/> + <terms:term id="28" name="Arable farming" inAtoZ="false"/> + <terms:term id="29" name="Cereal production" inAtoZ="false"/> + <terms:term id="30" name="Wheat growing" inAtoZ="false"/> + <terms:term id="31" name="Toxic substances" inAtoZ="false"/> + <terms:term id="32" name="Poisons" inAtoZ="false"/> + <terms:term id="33" name="Wasp control" inAtoZ="false"/> + <terms:term id="34" name="Cockroach control" inAtoZ="false"/> + <terms:term id="35" name="Rat control" inAtoZ="false"/> + <terms:term id="36" name="Vermin control" inAtoZ="false"/> + <terms:term id="37" name="Business development" inAtoZ="false"/> + <terms:term id="38" name="Start-ups (business)" inAtoZ="false"/> + <terms:term id="39" name="Trading standards" inAtoZ="false"/> + <terms:term id="40" name="Licensing of businesses" inAtoZ="false"/> + <terms:term id="41" name="Demolition" inAtoZ="false"/> + <terms:term id="42" name="Markets (street)" inAtoZ="false"/> + <terms:term id="43" name="Shops" inAtoZ="false"/> + <terms:term id="44" name="Distribution of electricity" inAtoZ="false"/> + <terms:term id="45" name="Textile industry" inAtoZ="false"/> + <terms:term id="46" name="Metalworking industry" inAtoZ="false"/> + <terms:term id="47" name="Paper manufacturing" inAtoZ="false"/> + <terms:term id="48" name="Electrical appliance manufacture" inAtoZ="false"/> + <terms:term id="49" name="Furniture making" inAtoZ="false"/> + <terms:term id="50" name="Woodworking industry" inAtoZ="false"/> + <terms:term id="51" name="Companies" inAtoZ="false"/> + <terms:term id="52" name="Employers (companies)" inAtoZ="false"/> + <terms:term id="53" name="Grass cutting (road verges)" inAtoZ="false"/> + <terms:term id="54" name="Free speech" inAtoZ="false"/> + <terms:term id="55" name="Property theft" inAtoZ="false"/> + <terms:term id="56" name="Parole" inAtoZ="false"/> + <terms:term id="57" name="Labour market" inAtoZ="false"/> + <terms:term id="58" name="Unemployment statistics" inAtoZ="false"/> + <terms:term id="59" name="Employment statistics" inAtoZ="false"/> + <terms:term id="60" name="Skill shortages (labour market)" inAtoZ="false"/> + <terms:term id="61" name="Inward investment" inAtoZ="false"/> + <terms:term id="62" name="Outward investment" inAtoZ="false"/> + <terms:term id="63" name="Rates (local tax)" inAtoZ="false"/> + <terms:term id="64" name="Debt (personal)" inAtoZ="false"/> + <terms:term id="65" name="Local elections" inAtoZ="false"/> + <terms:term id="66" name="General elections" inAtoZ="false"/> + <terms:term id="67" name="Parish councils" inAtoZ="false"/> + <terms:term id="68" name="District councils" inAtoZ="false"/> + <terms:term id="69" name="Town councils" inAtoZ="false"/> + <terms:term id="70" name="County councils" inAtoZ="false"/> + <terms:term id="71" name="Mayors" inAtoZ="false"/> + <terms:term id="72" name="Maladministration" inAtoZ="false"/> + <terms:term id="73" name="Delays (public services)" inAtoZ="false"/> + <terms:term id="74" name="Complaints (public services)" inAtoZ="false"/> + <terms:term id="75" name="Incompetence (public services)" inAtoZ="false"/> + <terms:term id="76" name="Negligence (public services)" inAtoZ="false"/> + <terms:term id="77" name="Misinformation (public services)" inAtoZ="false"/> + <terms:term id="78" name="Misdirection (public services)" inAtoZ="false"/> + <terms:term id="79" name="Ombudsmen" inAtoZ="false"/> + <terms:term id="80" name="Commissions (public bodies)" inAtoZ="false"/> + <terms:term id="81" name="Cattle markets" inAtoZ="false"/> + <terms:term id="82" name="Animal markets" inAtoZ="false"/> + <terms:term id="83" name="Livestock industry" inAtoZ="false"/> + <terms:term id="84" name="Higher education" inAtoZ="false"/> + <terms:term id="85" name="Student finance" inAtoZ="false"/> + <terms:term id="86" name="Tuition fees (universities and colleges)" inAtoZ="false"/> + <terms:term id="87" name="Grants and loans (students)" inAtoZ="false"/> + <terms:term id="88" name="Educational grants (students)" inAtoZ="false"/> + <terms:term id="89" name="Scholarships (students)" inAtoZ="false"/> + <terms:term id="90" name="Funding (students)" inAtoZ="false"/> + <terms:term id="91" name="A-levels" inAtoZ="false"/> + <terms:term id="92" name="S-levels" inAtoZ="false"/> + <terms:term id="93" name="Higher grade qualifications" inAtoZ="false"/> + <terms:term id="94" name="SVQs" inAtoZ="false"/> + <terms:term id="95" name="Scottish vocational qualifications (SVQs)" inAtoZ="false"/> + <terms:term id="96" name="School types and choosing a school" inAtoZ="false"/> + <terms:term id="97" name="Headteachers" inAtoZ="false"/> + <terms:term id="99" name="Schoolteachers" inAtoZ="false"/> + <terms:term id="100" name="Learning disabilities" inAtoZ="false"/> + <terms:term id="101" name="Standard grade qualifications" inAtoZ="false"/> + <terms:term id="102" name="Attendance allowance" inAtoZ="false"/> + <terms:term id="103" name="Disability allowance" inAtoZ="false"/> + <terms:term id="104" name="Allowances (welfare benefits)" inAtoZ="false"/> + <terms:term id="105" name="Disability living allowance" inAtoZ="false"/> + <terms:term id="106" name="Council tax benefit" inAtoZ="false"/> + <terms:term id="107" name="Housing benefit" inAtoZ="false"/> + <terms:term id="108" name="Incapacity benefit" inAtoZ="false"/> + <terms:term id="109" name="Income support" inAtoZ="false"/> + <terms:term id="110" name="Invalid care allowance" inAtoZ="false"/> + <terms:term id="111" name="Severe disablement allowance" inAtoZ="false"/> + <terms:term id="112" name="Travel concessions" inAtoZ="false"/> + <terms:term id="113" name="Visual impairment" inAtoZ="false"/> + <terms:term id="114" name="Sight impairment" inAtoZ="false"/> + <terms:term id="115" name="Partially sighted people" inAtoZ="false"/> + <terms:term id="116" name="Medicines" inAtoZ="false"/> + <terms:term id="117" name="Prescription drugs" inAtoZ="false"/> + <terms:term id="118" name="Over the counter drugs" inAtoZ="false"/> + <terms:term id="119" name="Drugs (prescription)" inAtoZ="false"/> + <terms:term id="120" name="Pharmaceuticals" inAtoZ="false"/> + <terms:term id="121" name="Drug abuse" inAtoZ="false"/> + <terms:term id="122" name="Drug addiction" inAtoZ="false"/> + <terms:term id="123" name="Recreational drug use" inAtoZ="false"/> + <terms:term id="124" name="Addiction (drugs)" inAtoZ="false"/> + <terms:term id="125" name="Addiction (smoking)" inAtoZ="false"/> + <terms:term id="126" name="Addiction (alcohol)" inAtoZ="false"/> + <terms:term id="128" name="Infectious diseases (human)" inAtoZ="false"/> + <terms:term id="129" name="Contagious diseases (human)" inAtoZ="false"/> + <terms:term id="130" name="Illnesses" inAtoZ="false"/> + <terms:term id="132" name="Infectious diseases (animal)" inAtoZ="false"/> + <terms:term id="133" name="Contagious diseases (animal)" inAtoZ="false"/> + <terms:term id="134" name="Asbestos hazards" inAtoZ="false"/> + <terms:term id="135" name="Radioactive materials" inAtoZ="false"/> + <terms:term id="136" name="Hygiene" inAtoZ="false"/> + <terms:term id="137" name="Cleaning (hygiene)" inAtoZ="false"/> + <terms:term id="138" name="Washing (hygiene)" inAtoZ="false"/> + <terms:term id="139" name="Disinfection (hygiene)" inAtoZ="false"/> + <terms:term id="140" name="Care for children" inAtoZ="false"/> + <terms:term id="141" name="Care for the elderly" inAtoZ="false"/> + <terms:term id="142" name="Care for the disabled" inAtoZ="false"/> + <terms:term id="143" name="Youth services" inAtoZ="false"/> + <terms:term id="144" name="Childcare" inAtoZ="false"/> + <terms:term id="145" name="Child care services" inAtoZ="false"/> + <terms:term id="146" name="Child minding" inAtoZ="false"/> + <terms:term id="147" name="Day care (children)" inAtoZ="false"/> + <terms:term id="148" name="Residential care (children)" inAtoZ="false"/> + <terms:term id="149" name="Nanny services" inAtoZ="false"/> + <terms:term id="150" name="Creches (childcare)" inAtoZ="false"/> + <terms:term id="151" name="Children's homes" inAtoZ="false"/> + <terms:term id="153" name="Nurseries (child care)" inAtoZ="false"/> + <terms:term id="154" name="Playschemes" inAtoZ="false"/> + <terms:term id="155" name="Playgroups" inAtoZ="false"/> + <terms:term id="156" name="Shopmobility" inAtoZ="false"/> + <terms:term id="157" name="Mobility for the disabled" inAtoZ="false"/> + <terms:term id="158" name="Access for disabled people" inAtoZ="false"/> + <terms:term id="159" name="Child protection" inAtoZ="false"/> + <terms:term id="160" name="Day care (for elderly people)" inAtoZ="false"/> + <terms:term id="161" name="Residential care (elderly people)" inAtoZ="false"/> + <terms:term id="162" name="Old people's homes" inAtoZ="false"/> + <terms:term id="163" name="Residential homes for the elderly" inAtoZ="false"/> + <terms:term id="164" name="Social welfare" inAtoZ="false"/> + <terms:term id="165" name="Respite care" inAtoZ="false"/> + <terms:term id="166" name="Day centres for the elderly" inAtoZ="false"/> + <terms:term id="167" name="Employers' responsibilities" inAtoZ="false"/> + <terms:term id="168" name="Industrial diseases" inAtoZ="false"/> + <terms:term id="169" name="Careers and career development" inAtoZ="false"/> + <terms:term id="170" name="Careers advice" inAtoZ="false"/> + <terms:term id="171" name="Army (UK)" inAtoZ="false"/> + <terms:term id="172" name="Air Force (UK)" inAtoZ="false"/> + <terms:term id="173" name="Navy (UK)" inAtoZ="false"/> + <terms:term id="174" name="UNHCR" inAtoZ="false"/> + <terms:term id="175" name="Arms (military)" inAtoZ="false"/> + <terms:term id="176" name="Armaments" inAtoZ="false"/> + <terms:term id="177" name="Military aircraft" inAtoZ="false"/> + <terms:term id="178" name="Aircraft (military)" inAtoZ="false"/> + <terms:term id="179" name="Naval vessels" inAtoZ="false"/> + <terms:term id="180" name="Warships" inAtoZ="false"/> + <terms:term id="181" name="Ships (Navy)" inAtoZ="false"/> + <terms:term id="186" name="Conflict (overseas)" inAtoZ="false"/> + <terms:term id="187" name="Conflict (industrial relations)" inAtoZ="false"/> + <terms:term id="188" name="Conflict (civil emergency)" inAtoZ="false"/> + <terms:term id="189" name="Conflict control (international)" inAtoZ="false"/> + <terms:term id="192" name="Arms (civilian use)" inAtoZ="false"/> + <terms:term id="193" name="Development aid" inAtoZ="false"/> + <terms:term id="194" name="Country parks" inAtoZ="false"/> + <terms:term id="195" name="Conservation (heritage)" inAtoZ="false"/> + <terms:term id="196" name="Opera" inAtoZ="false"/> + <terms:term id="197" name="Theatre" inAtoZ="false"/> + <terms:term id="198" name="Ballet" inAtoZ="false"/> + <terms:term id="199" name="Concerts" inAtoZ="false"/> + <terms:term id="200" name="Pop concerts" inAtoZ="false"/> + <terms:term id="201" name="Music" inAtoZ="false"/> + <terms:term id="202" name="Drama" inAtoZ="false"/> + <terms:term id="203" name="Dance (performance)" inAtoZ="false"/> + <terms:term id="204" name="Pantomime" inAtoZ="false"/> + <terms:term id="205" name="Cinema" inAtoZ="false"/> + <terms:term id="206" name="Movies" inAtoZ="false"/> + <terms:term id="207" name="Television" inAtoZ="false"/> + <terms:term id="208" name="Photography (art)" inAtoZ="false"/> + <terms:term id="209" name="Holidays (tourism)" inAtoZ="false"/> + <terms:term id="210" name="Package holidays" inAtoZ="false"/> + <terms:term id="211" name="Holidays from work" inAtoZ="false"/> + <terms:term id="212" name="Grass cutting (garden maintenance)" inAtoZ="false"/> + <terms:term id="213" name="Street repairs" inAtoZ="false"/> + <terms:term id="214" name="Road works" inAtoZ="false"/> + <terms:term id="215" name="Speed limits" inAtoZ="false"/> + <terms:term id="216" name="Traffic calming" inAtoZ="false"/> + <terms:term id="217" name="Vehicle licences" inAtoZ="false"/> + <terms:term id="218" name="MOT Certification" inAtoZ="false"/> + <terms:term id="219" name="Taxis" inAtoZ="false"/> + <terms:term id="220" name="Minicabs" inAtoZ="false"/> + <terms:term id="221" name="Bus services" inAtoZ="false"/> + <terms:term id="222" name="Coach services" inAtoZ="false"/> + <terms:term id="223" name="Occupational pensions" inAtoZ="false"/> + <terms:term id="224" name="Stakeholder pensions" inAtoZ="false"/> + <terms:term id="225" name="Claiming benefits" inAtoZ="false"/> + <terms:term id="226" name="House ownership" inAtoZ="false"/> + <terms:term id="227" name="Council housing" inAtoZ="false"/> + <terms:term id="228" name="Home ownership" inAtoZ="false"/> + <terms:term id="229" name="Evictions (council housing)" inAtoZ="false"/> + <terms:term id="230" name="Property (housing)" inAtoZ="false"/> + <terms:term id="231" name="Tenancy (housing)" inAtoZ="false"/> + <terms:term id="232" name="Squatters" inAtoZ="false"/> + <terms:term id="233" name="Rented accommodation (private)" inAtoZ="false"/> + <terms:term id="234" name="Social exclusion" inAtoZ="false"/> + <terms:term id="235" name="Death and funerals" inAtoZ="false"/> + <terms:term id="236" name="Funerals" inAtoZ="false"/> + <terms:term id="237" name="Cremation" inAtoZ="false"/> + <terms:term id="238" name="Burials (people)" inAtoZ="false"/> + <terms:term id="239" name="Weddings" inAtoZ="false"/> + <terms:term id="240" name="Registration (births and deaths)" inAtoZ="false"/> + <terms:term id="241" name="Management (public sector)" inAtoZ="false"/> + <terms:term id="242" name="Video recording industry" inAtoZ="false"/> + <terms:term id="243" name="Aircraft industry" inAtoZ="false"/> + <terms:term id="244" name="Natural gas extraction" inAtoZ="false"/> + <terms:term id="245" name="Deregulation" inAtoZ="false"/> + <terms:term id="246" name="Power supply (electricity)" inAtoZ="false"/> + <terms:term id="247" name="Atomic energy" inAtoZ="false"/> + <terms:term id="248" name="Enterprises (companies)" inAtoZ="false"/> + <terms:term id="249" name="Corporations" inAtoZ="false"/> + <terms:term id="250" name="Water transport (inland)" inAtoZ="false"/> + <terms:term id="251" name="Water transport (sea-going)" inAtoZ="false"/> + <terms:term id="252" name="Road safety" inAtoZ="false"/> + <terms:term id="253" name="Accidents (road)" inAtoZ="false"/> + <terms:term id="254" name="Crashes (road vehicles)" inAtoZ="false"/> + <terms:term id="255" name="Road accidents" inAtoZ="false"/> + <terms:term id="256" name="Air crashes" inAtoZ="false"/> + <terms:term id="257" name="Accidents (air travel)" inAtoZ="false"/> + <terms:term id="258" name="Safety (air transport)" inAtoZ="false"/> + <terms:term id="259" name="Aircraft (civilian)" inAtoZ="false"/> + <terms:term id="260" name="Safety (roads)" inAtoZ="false"/> + <terms:term id="261" name="Rail crashes" inAtoZ="false"/> + <terms:term id="262" name="Crashes (trains)" inAtoZ="false"/> + <terms:term id="263" name="Accidents (railways)" inAtoZ="false"/> + <terms:term id="264" name="Safety (rail transport)" inAtoZ="false"/> + <terms:term id="265" name="Crashes (aircraft)" inAtoZ="false"/> + <terms:term id="266" name="Cars (road vehicles)" inAtoZ="false"/> + <terms:term id="267" name="Lorries" inAtoZ="false"/> + <terms:term id="268" name="Motorcycles" inAtoZ="false"/> + <terms:term id="269" name="Human rights" inAtoZ="false"/> + <terms:term id="270" name="Civil law" inAtoZ="false"/> + <terms:term id="271" name="Criminal law" inAtoZ="false"/> + <terms:term id="272" name="International law" inAtoZ="false"/> + <terms:term id="273" name="Confidentiality (data security)" inAtoZ="false"/> + <terms:term id="274" name="Confidentiality (personal data)" inAtoZ="false"/> + <terms:term id="275" name="Capital investment" inAtoZ="false"/> + <terms:term id="276" name="National economy (UK)" inAtoZ="false"/> + <terms:term id="277" name="Early years education" inAtoZ="false"/> + <terms:term id="278" name="Religious discrimination (education and employment)" inAtoZ="false"/> + <terms:term id="279" name="Job seeking" inAtoZ="false"/> + <terms:term id="280" name="Jobcentres" inAtoZ="false"/> + <terms:term id="281" name="Recruitment (jobseeking)" inAtoZ="false"/> + <terms:term id="282" name="Diseases (occupational)" inAtoZ="false"/> + <terms:term id="283" name="Employment conditions" inAtoZ="false"/> + <terms:term id="284" name="Employee rights" inAtoZ="false"/> + <terms:term id="285" name="Conduct at work" inAtoZ="false"/> + <terms:term id="286" name="Termination of employment" inAtoZ="false"/> + <terms:term id="287" name="Dismissal from employment" inAtoZ="false"/> + <terms:term id="288" name="Leave from work" inAtoZ="false"/> + <terms:term id="289" name="Maternity leave" inAtoZ="false"/> + <terms:term id="290" name="Sick leave" inAtoZ="false"/> + <terms:term id="291" name="Absence from work" inAtoZ="false"/> + <terms:term id="292" name="Working week" inAtoZ="false"/> + <terms:term id="293" name="Unsocial hours of work" inAtoZ="false"/> + <terms:term id="294" name="Shiftwork" inAtoZ="false"/> + <terms:term id="295" name="Retirement terms" inAtoZ="false"/> + <terms:term id="296" name="Redundancy terms" inAtoZ="false"/> + <terms:term id="297" name="Physically disabled people" inAtoZ="false"/> + <terms:term id="298" name="Mentally disabled people" inAtoZ="false"/> + <terms:term id="299" name="Management (NHS)" inAtoZ="false"/> + <terms:term id="300" name="Complaints (consumer affairs)" inAtoZ="false"/> + <terms:term id="302" name="Public funding" inAtoZ="false"/> + <terms:term id="303" name="Grants (non-educational)" inAtoZ="false"/> + <terms:term id="304" name="Government grants" inAtoZ="false"/> + <terms:term id="305" name="Government loans" inAtoZ="false"/> + <terms:term id="306" name="Subsidies from government" inAtoZ="false"/> + <terms:term id="307" name="Funding (public sector)" inAtoZ="false"/> + <terms:term id="308" name="Compensation by the government" inAtoZ="false"/> + <terms:term id="309" name="Waste disposal" inAtoZ="false"/> + <terms:term id="310" name="Heavy goods vehicles" inAtoZ="false"/> + <terms:term id="311" name="School age employment" inAtoZ="false"/> + <terms:term id="312" name="ICT (information and communication technology)" inAtoZ="false"/> + <terms:term id="313" name="Information technology" inAtoZ="false"/> + <terms:term id="314" name="Habitat conservation" inAtoZ="false"/> + <terms:term id="315" name="Rodent control" inAtoZ="false"/> + <terms:term id="316" name="Flea control" inAtoZ="false"/> + <terms:term id="317" name="Property security" inAtoZ="false"/> + <terms:term id="318" name="IS (Income support)" inAtoZ="false"/> + <terms:term id="319" name="Jobseekers allowance" inAtoZ="false"/> + <terms:term id="320" name="JSA (Jobseekers allowance)" inAtoZ="false"/> + <terms:term id="321" name="AA (Attendance allowance)" inAtoZ="false"/> + <terms:term id="322" name="DLA (Disability living allowance)" inAtoZ="false"/> + <terms:term id="323" name="Child benefit" inAtoZ="false"/> + <terms:term id="324" name="CHB (Child benefit)" inAtoZ="false"/> + <terms:term id="325" name="Working family tax credit" inAtoZ="false"/> + <terms:term id="326" name="WFTC (Working family tax credit)" inAtoZ="false"/> + <terms:term id="327" name="Disabled persons tax credit" inAtoZ="false"/> + <terms:term id="328" name="DPTC (Disabled persons tax credit)" inAtoZ="false"/> + <terms:term id="329" name="Bereavement payment" inAtoZ="false"/> + <terms:term id="330" name="Degrees (university)" inAtoZ="false"/> + <terms:term id="331" name="Diplomas (college)" inAtoZ="false"/> + <terms:term id="332" name="Absence from school" inAtoZ="false"/> + <terms:term id="333" name="Qualifications (pre-16)" inAtoZ="false"/> + <terms:term id="334" name="Specialist schools" inAtoZ="false"/> + <terms:term id="335" name="Loans (students)" inAtoZ="false"/> + <terms:term id="336" name="Awards (student funding)" inAtoZ="false"/> + <terms:term id="337" name="Choice of school" inAtoZ="false"/> + <terms:term id="338" name="Armed services" inAtoZ="false"/> + <terms:term id="339" name="Joint Services (Defence)" inAtoZ="false"/> + <terms:term id="340" name="Private rented accommodation" inAtoZ="false"/> + <terms:term id="341" name="Social housing" inAtoZ="false"/> + <terms:term id="342" name="Housing repairs and renovation" inAtoZ="false"/> + <terms:term id="343" name="Housing associations" inAtoZ="false"/> + <terms:term id="344" name="Housing cooperatives" inAtoZ="false"/> + <terms:term id="345" name="Cooperatives (housing)" inAtoZ="false"/> + <terms:term id="346" name="Evictions (private rented property)" inAtoZ="false"/> + <terms:term id="347" name="Property purchase (home ownership)" inAtoZ="false"/> + <terms:term id="348" name="Repairs (housing)" inAtoZ="false"/> + <terms:term id="349" name="Renovation (housing)" inAtoZ="false"/> + <terms:term id="350" name="Maintenance (housing)" inAtoZ="false"/> + <terms:term id="351" name="Property maintenance (housing)" inAtoZ="false"/> + <terms:term id="352" name="Property maintenance (historic buildings)" inAtoZ="false"/> + <terms:term id="353" name="Hostels (holiday accommodation)" inAtoZ="false"/> + <terms:term id="354" name="Development (planning applications)" inAtoZ="false"/> + <terms:term id="355" name="Housing development plans" inAtoZ="false"/> + <terms:term id="356" name="Best value in public administration" inAtoZ="false"/> + <terms:term id="358" name="Performance (public sector bodies)" inAtoZ="false"/> + <terms:term id="359" name="Diseases" inAtoZ="false"/> + <terms:term id="360" name="Literature and writing" inAtoZ="false"/> + <terms:term id="361" name="Writing (creativity)" inAtoZ="false"/> + <terms:term id="362" name="Crafts" inAtoZ="false"/> + <terms:term id="363" name="Handicrafts" inAtoZ="false"/> + <terms:term id="364" name="Pottery" inAtoZ="false"/> + <terms:term id="365" name="Woodcrafts" inAtoZ="false"/> + <terms:term id="366" name="Needlecrafts" inAtoZ="false"/> + <terms:term id="367" name="Weaving" inAtoZ="false"/> + <terms:term id="368" name="Spinning" inAtoZ="false"/> + <terms:term id="369" name="Silversmithing" inAtoZ="false"/> + <terms:term id="370" name="Sewing" inAtoZ="false"/> + <terms:term id="371" name="Embroidery" inAtoZ="false"/> + <terms:term id="372" name="Poetry" inAtoZ="false"/> + <terms:term id="373" name="Bands (music)" inAtoZ="false"/> + <terms:term id="374" name="Birth registration" inAtoZ="false"/> + <terms:term id="375" name="Death registration" inAtoZ="false"/> + <terms:term id="376" name="School governance, management and finance" inAtoZ="false"/> + <terms:term id="378" name="Loans from government" inAtoZ="false"/> + <terms:term id="379" name="Learning-disabled people" inAtoZ="false"/> + <terms:term id="380" name="Dumb people" inAtoZ="false"/> + <terms:term id="381" name="Speech impaired people" inAtoZ="false"/> + <terms:term id="382" name="Fashion goods manufacturing" inAtoZ="false"/> + <terms:term id="384" name="Athletics" inAtoZ="false"/> + <terms:term id="385" name="Alcoholism" inAtoZ="false"/> + <terms:term id="386" name="Cloning technology" inAtoZ="false"/> + <terms:term id="387" name="Development (businesses)" inAtoZ="false"/> + <terms:term id="388" name="High courts" inAtoZ="false"/> + <terms:term id="389" name="Youth courts" inAtoZ="false"/> + <terms:term id="390" name="County courts" inAtoZ="false"/> + <terms:term id="391" name="Crown court" inAtoZ="false"/> + <terms:term id="392" name="Courts of appeal" inAtoZ="false"/> + <terms:term id="393" name="Magistrates courts" inAtoZ="false"/> + <terms:term id="394" name="Small claims courts" inAtoZ="false"/> + <terms:term id="395" name="Guns (Armed services)" inAtoZ="false"/> + <terms:term id="396" name="OFSTED inspections" inAtoZ="false"/> + <terms:term id="397" name="Learndirect" inAtoZ="false"/> + <terms:term id="398" name="Learning opportunities for adults" inAtoZ="false"/> + <terms:term id="400" name="Finance" inAtoZ="false"/> + <terms:term id="401" name="Finance (public sector)" inAtoZ="false"/> + <terms:term id="402" name="Finance (personal)" inAtoZ="false"/> + <terms:term id="403" name="EMU (European Monetary Union)" inAtoZ="false"/> + <terms:term id="404" name="Boys" inAtoZ="false"/> + <terms:term id="405" name="Girls" inAtoZ="false"/> + <terms:term id="406" name="Infants" inAtoZ="false"/> + <terms:term id="407" name="Babies" inAtoZ="false"/> + <terms:term id="408" name="Bar services" inAtoZ="false"/> + <terms:term id="409" name="Bridleways and footpaths" inAtoZ="false"/> + <terms:term id="410" name="FOI (Freedom of Information)" inAtoZ="false"/> + <terms:term id="411" name="Betting" inAtoZ="false"/> + <terms:term id="412" name="Hazards (occupational)" inAtoZ="false"/> + <terms:term id="413" name="Thrombosis" inAtoZ="false"/> + <terms:term id="414" name="House purchase" inAtoZ="false"/> + <terms:term id="415" name="Sleeping rough" inAtoZ="false"/> + <terms:term id="416" name="Labelling (hazardous substances)" inAtoZ="false"/> + <terms:term id="417" name="Sheep farming" inAtoZ="false"/> + <terms:term id="418" name="Cattle farming" inAtoZ="false"/> + <terms:term id="419" name="Pig farming" inAtoZ="false"/> + <terms:term id="420" name="Management (schools)" inAtoZ="false"/> + <terms:term id="421" name="Funding of schools" inAtoZ="false"/> + <terms:term id="422" name="Mutton" inAtoZ="false"/> + <terms:term id="423" name="Bacon" inAtoZ="false"/> + <terms:term id="424" name="Ham" inAtoZ="false"/> + <terms:term id="425" name="Veal" inAtoZ="false"/> + <terms:term id="426" name="Venison" inAtoZ="false"/> + <terms:term id="427" name="Training (military)" inAtoZ="false"/> + <terms:term id="428" name="Ice cream" inAtoZ="false"/> + <terms:term id="429" name="Yoghurt" inAtoZ="false"/> + <terms:term id="430" name="Orchestras" inAtoZ="false"/> + <terms:term id="431" name="Share dealing" inAtoZ="false"/> + <terms:term id="432" name="Headmasters" inAtoZ="false"/> + <terms:term id="433" name="Rubbish collection" inAtoZ="false"/> + <terms:term id="435" name="Studies and qualifications (post-16)" inAtoZ="false"/> + <terms:term id="436" name="GNVQs (vocational A-levels)" inAtoZ="false"/> + <terms:term id="437" name="National vocational qualifications (NVQs)" inAtoZ="false"/> + <terms:term id="438" name="NVQs" inAtoZ="false"/> + <terms:term id="439" name="Education and skills" inAtoZ="false"/> + <terms:term id="440" name="Abandoned vehicles" inAtoZ="false"/> + <terms:term id="441" name="Roads and road transport" inAtoZ="false"/> + <terms:term id="442" name="Abattoirs" inAtoZ="false"/> + <terms:term id="443" name="Meat and livestock industries" inAtoZ="false"/> + <terms:term id="444" name="Abortion" inAtoZ="false"/> + <terms:term id="445" name="Family planning" inAtoZ="false"/> + <terms:term id="446" name="Access to countryside" inAtoZ="false"/> + <terms:term id="447" name="Footpaths and bridleways" inAtoZ="false"/> + <terms:term id="448" name="Right to roam" inAtoZ="false"/> + <terms:term id="449" name="Rights of way" inAtoZ="false"/> + <terms:term id="450" name="Countryside" inAtoZ="false"/> + <terms:term id="451" name="Access to public services" inAtoZ="false"/> + <terms:term id="453" name="Accidents (public)" inAtoZ="false"/> + <terms:term id="454" name="Civil emergencies" inAtoZ="false"/> + <terms:term id="455" name="Accidents at work" inAtoZ="false"/> + <terms:term id="456" name="Occupational health and safety" inAtoZ="false"/> + <terms:term id="457" name="Accidents in the home" inAtoZ="false"/> + <terms:term id="458" name="Safety in the home" inAtoZ="false"/> + <terms:term id="459" name="Accommodation (housing)" inAtoZ="false"/> + <terms:term id="460" name="Housing" inAtoZ="false"/> + <terms:term id="461" name="Accommodation (tourism)" inAtoZ="false"/> + <terms:term id="462" name="Tourism" inAtoZ="false"/> + <terms:term id="463" name="Acquired immune deficiency syndrome" inAtoZ="false"/> + <terms:term id="464" name="AIDS and HIV" inAtoZ="false"/> + <terms:term id="465" name="Acquisitions (business)" inAtoZ="false"/> + <terms:term id="466" name="Monopolies and mergers" inAtoZ="false"/> + <terms:term id="467" name="Action teams for jobs" inAtoZ="false"/> + <terms:term id="468" name="Unemployment and jobseeking" inAtoZ="false"/> + <terms:term id="469" name="Actual bodily harm" inAtoZ="false"/> + <terms:term id="470" name="Violence against the person" inAtoZ="false"/> + <terms:term id="471" name="Acute services (NHS)" inAtoZ="false"/> + <terms:term id="472" name="Secondary health care" inAtoZ="false"/> + <terms:term id="473" name="Administration (business)" inAtoZ="false"/> + <terms:term id="474" name="Business management" inAtoZ="false"/> + <terms:term id="475" name="Administration (public)" inAtoZ="false"/> + <terms:term id="476" name="Public administration" inAtoZ="false"/> + <terms:term id="477" name="Admissions (schools)" inAtoZ="false"/> + <terms:term id="478" name="Adolescents" inAtoZ="false"/> + <terms:term id="479" name="Young people" inAtoZ="false"/> + <terms:term id="480" name="Adoption" inAtoZ="false"/> + <terms:term id="481" name="Care" inAtoZ="false"/> + <terms:term id="482" name="Adult basic skills" inAtoZ="false"/> + <terms:term id="483" name="Adult education and skills" inAtoZ="false"/> + <terms:term id="484" name="Adult learning and skills" inAtoZ="false"/> + <terms:term id="485" name="Advanced skills teachers" inAtoZ="false"/> + <terms:term id="486" name="Teachers and school staff" inAtoZ="false"/> + <terms:term id="487" name="Advertising" inAtoZ="false"/> + <terms:term id="488" name="Business practice and regulation" inAtoZ="false"/> + <terms:term id="489" name="Media and the press" inAtoZ="false"/> + <terms:term id="490" name="Communications industries" inAtoZ="false"/> + <terms:term id="491" name="Affirmative action (equal opportunities)" inAtoZ="false"/> + <terms:term id="492" name="Equal opportunities and diversity" inAtoZ="false"/> + <terms:term id="493" name="Aged people" inAtoZ="false"/> + <terms:term id="494" name="Older people" inAtoZ="false"/> + <terms:term id="495" name="Agricultural land" inAtoZ="false"/> + <terms:term id="496" name="Land" inAtoZ="false"/> + <terms:term id="497" name="Agriculture (farming)" inAtoZ="false"/> + <terms:term id="498" name="Farming" inAtoZ="false"/> + <terms:term id="499" name="Agriculture, environment and natural resources" inAtoZ="false"/> + <terms:term id="500" name="Energy and fuel" inAtoZ="false"/> + <terms:term id="501" name="Environmental protection" inAtoZ="false"/> + <terms:term id="502" name="Fisheries and aquaculture" inAtoZ="false"/> + <terms:term id="503" name="Forestry" inAtoZ="false"/> + <terms:term id="504" name="Horticulture" inAtoZ="false"/> + <terms:term id="505" name="Plants and animals" inAtoZ="false"/> + <terms:term id="506" name="Waste management" inAtoZ="false"/> + <terms:term id="507" name="Water resources" inAtoZ="false"/> + <terms:term id="508" name="Aid (charitable giving)" inAtoZ="false"/> + <terms:term id="509" name="Charities" inAtoZ="false"/> + <terms:term id="510" name="Aid (international)" inAtoZ="false"/> + <terms:term id="511" name="International development and aid" inAtoZ="false"/> + <terms:term id="512" name="HIV (human immunodeficiency virus)" inAtoZ="false"/> + <terms:term id="513" name="Human immunodeficiency virus" inAtoZ="false"/> + <terms:term id="514" name="Health" inAtoZ="false"/> + <terms:term id="515" name="Royal Air Force" inAtoZ="false"/> + <terms:term id="516" name="Armed forces" inAtoZ="false"/> + <terms:term id="517" name="Air transport" inAtoZ="false"/> + <terms:term id="518" name="Airports" inAtoZ="false"/> + <terms:term id="519" name="Aviation" inAtoZ="false"/> + <terms:term id="520" name="Low flying aircraft (civilian)" inAtoZ="false"/> + <terms:term id="521" name="Transport" inAtoZ="false"/> + <terms:term id="522" name="Alcohol use and abuse" inAtoZ="false"/> + <terms:term id="523" name="Drugs and alcohol" inAtoZ="false"/> + <terms:term id="524" name="Drinks" inAtoZ="false"/> + <terms:term id="525" name="Alcohol-related crime" inAtoZ="false"/> + <terms:term id="526" name="Drug-related crime" inAtoZ="false"/> + <terms:term id="527" name="Alcoholic drinks" inAtoZ="false"/> + <terms:term id="528" name="Allotments" inAtoZ="false"/> + <terms:term id="529" name="Parks and gardens" inAtoZ="false"/> + <terms:term id="530" name="Ambulance services" inAtoZ="false"/> + <terms:term id="531" name="National Health Service (NHS)" inAtoZ="false"/> + <terms:term id="532" name="Emergencies" inAtoZ="false"/> + <terms:term id="533" name="Ancient monuments" inAtoZ="false"/> + <terms:term id="534" name="Heritage" inAtoZ="false"/> + <terms:term id="535" name="Ancillary health services staff" inAtoZ="false"/> + <terms:term id="536" name="Carers and health professionals" inAtoZ="false"/> + <terms:term id="537" name="Animal disease" inAtoZ="false"/> + <terms:term id="538" name="Animal health" inAtoZ="false"/> + <terms:term id="539" name="Animal experimentation" inAtoZ="false"/> + <terms:term id="540" name="Animal testing" inAtoZ="false"/> + <terms:term id="541" name="Vivisection (animals)" inAtoZ="false"/> + <terms:term id="542" name="Animal rights and welfare" inAtoZ="false"/> + <terms:term id="543" name="Ethical issues" inAtoZ="false"/> + <terms:term id="544" name="Research and development" inAtoZ="false"/> + <terms:term id="545" name="Animal quarantine" inAtoZ="false"/> + <terms:term id="546" name="Brucellosis" inAtoZ="false"/> + <terms:term id="547" name="Classical swine fever" inAtoZ="false"/> + <terms:term id="548" name="Disease (animals)" inAtoZ="false"/> + <terms:term id="549" name="Passports for animals" inAtoZ="false"/> + <terms:term id="550" name="Pet Travel Scheme (PETS)" inAtoZ="false"/> + <terms:term id="551" name="Quarantine (animals)" inAtoZ="false"/> + <terms:term id="552" name="Rabies" inAtoZ="false"/> + <terms:term id="553" name="Scrapie" inAtoZ="false"/> + <terms:term id="554" name="Swine fever" inAtoZ="false"/> + <terms:term id="555" name="Vaccines for animals" inAtoZ="false"/> + <terms:term id="556" name="Veterinary services" inAtoZ="false"/> + <terms:term id="557" name="Health, nutrition and care" inAtoZ="false"/> + <terms:term id="558" name="BSE, CJD and TSEs" inAtoZ="false"/> + <terms:term id="559" name="Foot and mouth disease" inAtoZ="false"/> + <terms:term id="560" name="Tuberculosis" inAtoZ="false"/> + <terms:term id="561" name="Animal production" inAtoZ="false"/> + <terms:term id="562" name="Animal welfare" inAtoZ="false"/> + <terms:term id="563" name="Welfare (animals)" inAtoZ="false"/> + <terms:term id="564" name="Crime, law, justice and rights" inAtoZ="false"/> + <terms:term id="565" name="Hunting" inAtoZ="false"/> + <terms:term id="566" name="Annual leave" inAtoZ="false"/> + <terms:term id="567" name="Working hours, terms and conditions" inAtoZ="false"/> + <terms:term id="568" name="Antisocial behaviour and disorder" inAtoZ="false"/> + <terms:term id="571" name="Hooliganism" inAtoZ="false"/> + <terms:term id="572" name="Vandalism" inAtoZ="false"/> + <terms:term id="573" name="Crime" inAtoZ="false"/> + <terms:term id="574" name="Apprenticeships" inAtoZ="false"/> + <terms:term id="575" name="Archaeology" inAtoZ="false"/> + <terms:term id="576" name="Architecture" inAtoZ="false"/> + <terms:term id="577" name="Churches (architecture)" inAtoZ="false"/> + <terms:term id="578" name="Culture and creativity" inAtoZ="false"/> + <terms:term id="579" name="Building and construction" inAtoZ="false"/> + <terms:term id="580" name="Archives" inAtoZ="false"/> + <terms:term id="581" name="Libraries and archives" inAtoZ="false"/> + <terms:term id="582" name="British Army" inAtoZ="false"/> + <terms:term id="583" name="Defence medical services" inAtoZ="false"/> + <terms:term id="584" name="Health care (Armed Forces)" inAtoZ="false"/> + <terms:term id="585" name="Joint Services (initiatives)" inAtoZ="false"/> + <terms:term id="586" name="Low flying aircraft (Armed Forces)" inAtoZ="false"/> + <terms:term id="587" name="Medical services (Armed Forces)" inAtoZ="false"/> + <terms:term id="588" name="Military training" inAtoZ="false"/> + <terms:term id="589" name="Royal Navy" inAtoZ="false"/> + <terms:term id="590" name="Reserves (Armed Forces)" inAtoZ="false"/> + <terms:term id="591" name="Service personnel (Armed Forces)" inAtoZ="false"/> + <terms:term id="592" name="Service recruitment (Armed Forces)" inAtoZ="false"/> + <terms:term id="593" name="Service resettlement (Armed Forces)" inAtoZ="false"/> + <terms:term id="594" name="Service welfare (Armed Forces)" inAtoZ="false"/> + <terms:term id="595" name="Veterans (Armed Forces)" inAtoZ="false"/> + <terms:term id="596" name="War widows" inAtoZ="false"/> + <terms:term id="597" name="Defence" inAtoZ="false"/> + <terms:term id="598" name="Arms control" inAtoZ="false"/> + <terms:term id="599" name="Arms proliferation" inAtoZ="false"/> + <terms:term id="600" name="Cluster bombs (clearance and control)" inAtoZ="false"/> + <terms:term id="601" name="Disarmament" inAtoZ="false"/> + <terms:term id="602" name="Land mines (clearance and control)" inAtoZ="false"/> + <terms:term id="603" name="Proliferation (arms)" inAtoZ="false"/> + <terms:term id="604" name="Weapons control (military)" inAtoZ="false"/> + <terms:term id="605" name="Weapons of mass destruction (control)" inAtoZ="false"/> + <terms:term id="606" name="Defence policy" inAtoZ="false"/> + <terms:term id="607" name="Firearms" inAtoZ="false"/> + <terms:term id="608" name="Army ranges" inAtoZ="false"/> + <terms:term id="609" name="Defence land and buildings" inAtoZ="false"/> + <terms:term id="610" name="Arranged marriages" inAtoZ="false"/> + <terms:term id="611" name="Marriage and divorce" inAtoZ="false"/> + <terms:term id="612" name="Arson" inAtoZ="false"/> + <terms:term id="613" name="Fire" inAtoZ="false"/> + <terms:term id="614" name="Art galleries" inAtoZ="false"/> + <terms:term id="615" name="Museums and galleries" inAtoZ="false"/> + <terms:term id="616" name="Arts, recreation and travel" inAtoZ="false"/> + <terms:term id="617" name="Millennium projects" inAtoZ="false"/> + <terms:term id="618" name="Performing arts" inAtoZ="false"/> + <terms:term id="619" name="Visual arts" inAtoZ="false"/> + <terms:term id="620" name="Assault" inAtoZ="false"/> + <terms:term id="621" name="Asylum" inAtoZ="false"/> + <terms:term id="622" name="Immigration and asylum" inAtoZ="false"/> + <terms:term id="623" name="Atomic Weapons Establishment" inAtoZ="false"/> + <terms:term id="624" name="Automotive industry" inAtoZ="false"/> + <terms:term id="625" name="Motor industry" inAtoZ="false"/> + <terms:term id="626" name="Baby foods" inAtoZ="false"/> + <terms:term id="627" name="Infant foods" inAtoZ="false"/> + <terms:term id="628" name="Food and drink" inAtoZ="false"/> + <terms:term id="629" name="Bank holidays" inAtoZ="false"/> + <terms:term id="630" name="Banking" inAtoZ="false"/> + <terms:term id="631" name="Financial service industries" inAtoZ="false"/> + <terms:term id="632" name="Curriculum and qualifications (pre-16)" inAtoZ="false"/> + <terms:term id="633" name="School performance and standards" inAtoZ="false"/> + <terms:term id="634" name="Beef" inAtoZ="false"/> + <terms:term id="635" name="Meat" inAtoZ="false"/> + <terms:term id="636" name="Beef industry" inAtoZ="false"/> + <terms:term id="637" name="Beer" inAtoZ="false"/> + <terms:term id="638" name="Benefits" inAtoZ="false"/> + <terms:term id="639" name="Social security" inAtoZ="false"/> + <terms:term id="640" name="Welfare benefits" inAtoZ="false"/> + <terms:term id="641" name="Welfare reform" inAtoZ="false"/> + <terms:term id="642" name="People, communities and living" inAtoZ="false"/> + <terms:term id="643" name="Pensions" inAtoZ="false"/> + <terms:term id="644" name="Living standards, incomes and wages" inAtoZ="false"/> + <terms:term id="645" name="Poverty" inAtoZ="false"/> + <terms:term id="646" name="Beverages" inAtoZ="false"/> + <terms:term id="647" name="Bilateral relations (international)" inAtoZ="false"/> + <terms:term id="648" name="International relations" inAtoZ="false"/> + <terms:term id="649" name="Biological warfare and defence" inAtoZ="false"/> + <terms:term id="650" name="Biotechnology" inAtoZ="false"/> + <terms:term id="651" name="Genetic engineering" inAtoZ="false"/> + <terms:term id="652" name="Science, technology and innovation" inAtoZ="false"/> + <terms:term id="653" name="Genetically modified food and crops" inAtoZ="false"/> + <terms:term id="654" name="Birth control" inAtoZ="false"/> + <terms:term id="655" name="Birthday honours" inAtoZ="false"/> + <terms:term id="656" name="Honours system" inAtoZ="false"/> + <terms:term id="657" name="Births (numbers)" inAtoZ="false"/> + <terms:term id="658" name="Population and migration" inAtoZ="false"/> + <terms:term id="659" name="Blair, Tony" inAtoZ="false"/> + <terms:term id="660" name="Prime Minister" inAtoZ="false"/> + <terms:term id="661" name="Blind people" inAtoZ="false"/> + <terms:term id="662" name="Disabled people" inAtoZ="false"/> + <terms:term id="663" name="Bovine spongiform encephalopathy" inAtoZ="false"/> + <terms:term id="664" name="Bovine tuberculosis" inAtoZ="false"/> + <terms:term id="665" name="Breast cancer screening" inAtoZ="false"/> + <terms:term id="666" name="Preventive medicine" inAtoZ="false"/> + <terms:term id="667" name="Broadcasting" inAtoZ="false"/> + <terms:term id="668" name="Radio broadcasting" inAtoZ="false"/> + <terms:term id="669" name="Television broadcasting" inAtoZ="false"/> + <terms:term id="670" name="Brownfield sites" inAtoZ="false"/> + <terms:term id="671" name="Urban communities" inAtoZ="false"/> + <terms:term id="672" name="CJD (Creutzfeldt-Jakob disease)" inAtoZ="false"/> + <terms:term id="673" name="Creutzfeldt-Jakob disease" inAtoZ="false"/> + <terms:term id="674" name="Mad cow disease" inAtoZ="false"/> + <terms:term id="675" name="New variant CJD" inAtoZ="false"/> + <terms:term id="676" name="nvCJD" inAtoZ="false"/> + <terms:term id="677" name="Transmissible spongiform encephalopathies" inAtoZ="false"/> + <terms:term id="678" name="TSEs (Transmissible spongiform encephalopathies)" inAtoZ="false"/> + <terms:term id="679" name="vCJD" inAtoZ="false"/> + <terms:term id="680" name="BSI standards" inAtoZ="false"/> + <terms:term id="681" name="Standards, weights and measures" inAtoZ="false"/> + <terms:term id="682" name="Budget (UK)" inAtoZ="false"/> + <terms:term id="683" name="Public finance" inAtoZ="false"/> + <terms:term id="684" name="Construction industry" inAtoZ="false"/> + <terms:term id="685" name="Business sectors" inAtoZ="false"/> + <terms:term id="686" name="Building regulations" inAtoZ="false"/> + <terms:term id="687" name="Bullying at school" inAtoZ="false"/> + <terms:term id="688" name="School welfare, behaviour and attendance" inAtoZ="false"/> + <terms:term id="689" name="Burglary" inAtoZ="false"/> + <terms:term id="690" name="Theft and burglary" inAtoZ="false"/> + <terms:term id="691" name="Bus stops and stations" inAtoZ="false"/> + <terms:term id="692" name="Business and industry" inAtoZ="false"/> + <terms:term id="693" name="Consumer affairs" inAtoZ="false"/> + <terms:term id="694" name="International trade" inAtoZ="false"/> + <terms:term id="695" name="Small businesses" inAtoZ="false"/> + <terms:term id="696" name="Business crime" inAtoZ="false"/> + <terms:term id="697" name="Fraud (business)" inAtoZ="false"/> + <terms:term id="698" name="Business intelligence" inAtoZ="false"/> + <terms:term id="699" name="Intelligence" inAtoZ="false"/> + <terms:term id="700" name="Management (business)" inAtoZ="false"/> + <terms:term id="701" name="Company law" inAtoZ="false"/> + <terms:term id="702" name="Competitiveness" inAtoZ="false"/> + <terms:term id="703" name="e-Commerce" inAtoZ="false"/> + <terms:term id="704" name="Regulation and deregulation" inAtoZ="false"/> + <terms:term id="705" name="Distribution and service industries" inAtoZ="false"/> + <terms:term id="706" name="Manufacturing" inAtoZ="false"/> + <terms:term id="707" name="Mineral extraction, mining, quarrying" inAtoZ="false"/> + <terms:term id="708" name="Butter" inAtoZ="false"/> + <terms:term id="709" name="Milk and dairy products" inAtoZ="false"/> + <terms:term id="710" name="Cabinet" inAtoZ="false"/> + <terms:term id="711" name="Central government" inAtoZ="false"/> + <terms:term id="712" name="Cabinet Ministers" inAtoZ="false"/> + <terms:term id="713" name="Ministers" inAtoZ="false"/> + <terms:term id="714" name="Canals" inAtoZ="false"/> + <terms:term id="715" name="Inland waterways" inAtoZ="false"/> + <terms:term id="716" name="Cancer" inAtoZ="false"/> + <terms:term id="717" name="Cancer screening" inAtoZ="false"/> + <terms:term id="718" name="Canoeing" inAtoZ="false"/> + <terms:term id="719" name="Water sports" inAtoZ="false"/> + <terms:term id="720" name="CAP (Common Agricultural Policy)" inAtoZ="false"/> + <terms:term id="721" name="Common Agricultural Policy" inAtoZ="false"/> + <terms:term id="722" name="Capital and financial markets" inAtoZ="false"/> + <terms:term id="723" name="Financial markets" inAtoZ="false"/> + <terms:term id="724" name="Stock exchange" inAtoZ="false"/> + <terms:term id="725" name="Stocks and shares" inAtoZ="false"/> + <terms:term id="726" name="Economics and finance" inAtoZ="false"/> + <terms:term id="727" name="Euro and EMU" inAtoZ="false"/> + <terms:term id="728" name="Capital gains tax" inAtoZ="false"/> + <terms:term id="729" name="Tax" inAtoZ="false"/> + <terms:term id="730" name="Car manufacture" inAtoZ="false"/> + <terms:term id="731" name="Car parks" inAtoZ="false"/> + <terms:term id="732" name="Cardiovascular diseases" inAtoZ="false"/> + <terms:term id="733" name="Heart disease and stroke" inAtoZ="false"/> + <terms:term id="734" name="Care in the community services" inAtoZ="false"/> + <terms:term id="735" name="Children's care services" inAtoZ="false"/> + <terms:term id="736" name="Community care" inAtoZ="false"/> + <terms:term id="737" name="Disability services" inAtoZ="false"/> + <terms:term id="738" name="Foster care" inAtoZ="false"/> + <terms:term id="739" name="Health in the community services" inAtoZ="false"/> + <terms:term id="740" name="Home care services" inAtoZ="false"/> + <terms:term id="741" name="Institutional care" inAtoZ="false"/> + <terms:term id="742" name="Services for the elderly" inAtoZ="false"/> + <terms:term id="743" name="Social care" inAtoZ="false"/> + <terms:term id="744" name="Social services" inAtoZ="false"/> + <terms:term id="745" name="Dentists" inAtoZ="false"/> + <terms:term id="746" name="Doctors" inAtoZ="false"/> + <terms:term id="747" name="Medical consultants" inAtoZ="false"/> + <terms:term id="748" name="Medical profession" inAtoZ="false"/> + <terms:term id="749" name="Nurses" inAtoZ="false"/> + <terms:term id="750" name="NHS management" inAtoZ="false"/> + <terms:term id="751" name="Occupations and employees" inAtoZ="false"/> + <terms:term id="752" name="Cargo transport" inAtoZ="false"/> + <terms:term id="753" name="Freight transport" inAtoZ="false"/> + <terms:term id="754" name="Catch limits (fishing)" inAtoZ="false"/> + <terms:term id="755" name="Catering services" inAtoZ="false"/> + <terms:term id="756" name="Food and drink services" inAtoZ="false"/> + <terms:term id="757" name="Censorship" inAtoZ="false"/> + <terms:term id="758" name="Information and communication" inAtoZ="false"/> + <terms:term id="759" name="Censuses" inAtoZ="false"/> + <terms:term id="760" name="Government, politics and public administration" inAtoZ="false"/> + <terms:term id="761" name="Executive agencies" inAtoZ="false"/> + <terms:term id="762" name="Government departments" inAtoZ="false"/> + <terms:term id="763" name="Volunteering" inAtoZ="false"/> + <terms:term id="764" name="Cheese" inAtoZ="false"/> + <terms:term id="765" name="Chemical industry" inAtoZ="false"/> + <terms:term id="766" name="Chemical warfare and defence" inAtoZ="false"/> + <terms:term id="767" name="Chicken meat" inAtoZ="false"/> + <terms:term id="768" name="Children" inAtoZ="false"/> + <terms:term id="769" name="Families and children" inAtoZ="false"/> + <terms:term id="770" name="Church (religious affairs)" inAtoZ="false"/> + <terms:term id="771" name="Religion" inAtoZ="false"/> + <terms:term id="772" name="Churches (heritage)" inAtoZ="false"/> + <terms:term id="773" name="Cities" inAtoZ="false"/> + <terms:term id="774" name="Citizenship education" inAtoZ="false"/> + <terms:term id="775" name="Civil and human rights" inAtoZ="false"/> + <terms:term id="776" name="Religious rights" inAtoZ="false"/> + <terms:term id="777" name="Rights (civil)" inAtoZ="false"/> + <terms:term id="778" name="Rights (human)" inAtoZ="false"/> + <terms:term id="779" name="Disasters (public)" inAtoZ="false"/> + <terms:term id="780" name="Drought emergencies" inAtoZ="false"/> + <terms:term id="781" name="Earthquakes" inAtoZ="false"/> + <terms:term id="782" name="Emergencies (public)" inAtoZ="false"/> + <terms:term id="783" name="Famine" inAtoZ="false"/> + <terms:term id="784" name="Flooding disasters" inAtoZ="false"/> + <terms:term id="785" name="Riots" inAtoZ="false"/> + <terms:term id="786" name="Seismic disasters" inAtoZ="false"/> + <terms:term id="787" name="Volcanic eruptions" inAtoZ="false"/> + <terms:term id="788" name="Flooding" inAtoZ="false"/> + <terms:term id="789" name="Civil justice system" inAtoZ="false"/> + <terms:term id="790" name="Justice system" inAtoZ="false"/> + <terms:term id="791" name="Civil Service" inAtoZ="false"/> + <terms:term id="792" name="Class sizes" inAtoZ="false"/> + <terms:term id="793" name="Climate and weather" inAtoZ="false"/> + <terms:term id="794" name="Drought conditions" inAtoZ="false"/> + <terms:term id="795" name="Global warming" inAtoZ="false"/> + <terms:term id="796" name="Greenhouse effect (atmospheric)" inAtoZ="false"/> + <terms:term id="797" name="Rainfall" inAtoZ="false"/> + <terms:term id="798" name="Weather" inAtoZ="false"/> + <terms:term id="799" name="Clinical services (NHS)" inAtoZ="false"/> + <terms:term id="800" name="Clinics (private)" inAtoZ="false"/> + <terms:term id="801" name="Private hospitals" inAtoZ="false"/> + <terms:term id="802" name="Clocking in" inAtoZ="false"/> + <terms:term id="803" name="Coal" inAtoZ="false"/> + <terms:term id="804" name="Fossil fuels" inAtoZ="false"/> + <terms:term id="805" name="Coal mining" inAtoZ="false"/> + <terms:term id="806" name="Coastal erosion and protection" inAtoZ="false"/> + <terms:term id="807" name="Coastguard services" inAtoZ="false"/> + <terms:term id="808" name="Cohabitation" inAtoZ="false"/> + <terms:term id="809" name="Commerce (international)" inAtoZ="false"/> + <terms:term id="810" name="Commerce (retail trade)" inAtoZ="false"/> + <terms:term id="811" name="Retail trade" inAtoZ="false"/> + <terms:term id="812" name="European Union" inAtoZ="false"/> + <terms:term id="813" name="Common Fisheries Policy" inAtoZ="false"/> + <terms:term id="814" name="Commonwealth" inAtoZ="false"/> + <terms:term id="815" name="International organisations" inAtoZ="false"/> + <terms:term id="816" name="Film-making" inAtoZ="false"/> + <terms:term id="817" name="Printing industry" inAtoZ="false"/> + <terms:term id="818" name="Publishing industry" inAtoZ="false"/> + <terms:term id="819" name="Sound recording industry" inAtoZ="false"/> + <terms:term id="820" name="Telecommunications industry" inAtoZ="false"/> + <terms:term id="821" name="Electronics industry" inAtoZ="false"/> + <terms:term id="822" name="Information and communication technology" inAtoZ="false"/> + <terms:term id="823" name="Internet" inAtoZ="false"/> + <terms:term id="824" name="Post Office" inAtoZ="false"/> + <terms:term id="825" name="Telephone services" inAtoZ="false"/> + <terms:term id="826" name="Communications systems (Defence)" inAtoZ="false"/> + <terms:term id="827" name="Defence equipment and supplies" inAtoZ="false"/> + <terms:term id="828" name="Community learning" inAtoZ="false"/> + <terms:term id="829" name="Computers" inAtoZ="false"/> + <terms:term id="830" name="Congestion (road traffic)" inAtoZ="false"/> + <terms:term id="831" name="Conservation (energy)" inAtoZ="false"/> + <terms:term id="832" name="Energy conservation" inAtoZ="false"/> + <terms:term id="833" name="Conservation (nature)" inAtoZ="false"/> + <terms:term id="834" name="Nature conservation" inAtoZ="false"/> + <terms:term id="835" name="Conservative Party" inAtoZ="false"/> + <terms:term id="836" name="Political parties" inAtoZ="false"/> + <terms:term id="837" name="Consignia" inAtoZ="false"/> + <terms:term id="838" name="Constituencies" inAtoZ="false"/> + <terms:term id="839" name="Electoral system" inAtoZ="false"/> + <terms:term id="840" name="Constitution" inAtoZ="false"/> + <terms:term id="841" name="Devolution" inAtoZ="false"/> + <terms:term id="842" name="Monarchy" inAtoZ="false"/> + <terms:term id="843" name="National Assembly for Wales" inAtoZ="false"/> + <terms:term id="844" name="Northern Ireland Assembly" inAtoZ="false"/> + <terms:term id="845" name="Scottish Parliament" inAtoZ="false"/> + <terms:term id="846" name="UK Parliament" inAtoZ="false"/> + <terms:term id="847" name="Consulates" inAtoZ="false"/> + <terms:term id="848" name="Embassies and consulates" inAtoZ="false"/> + <terms:term id="849" name="Consumer law" inAtoZ="false"/> + <terms:term id="850" name="Consumer protection" inAtoZ="false"/> + <terms:term id="851" name="Shopping" inAtoZ="false"/> + <terms:term id="852" name="Utilities" inAtoZ="false"/> + <terms:term id="853" name="Contract of employment" inAtoZ="false"/> + <terms:term id="854" name="Copyright" inAtoZ="false"/> + <terms:term id="855" name="Intellectual property" inAtoZ="false"/> + <terms:term id="856" name="Copyright law" inAtoZ="false"/> + <terms:term id="857" name="Coronary heart disease" inAtoZ="false"/> + <terms:term id="858" name="Coroners" inAtoZ="false"/> + <terms:term id="859" name="Judiciary" inAtoZ="false"/> + <terms:term id="860" name="Corporation tax" inAtoZ="false"/> + <terms:term id="861" name="Corruption" inAtoZ="false"/> + <terms:term id="862" name="Council tax" inAtoZ="false"/> + <terms:term id="863" name="Local taxes" inAtoZ="false"/> + <terms:term id="864" name="Hedgerows" inAtoZ="false"/> + <terms:term id="865" name="Rural communities" inAtoZ="false"/> + <terms:term id="866" name="Rural development" inAtoZ="false"/> + <terms:term id="867" name="Courier services" inAtoZ="false"/> + <terms:term id="868" name="Distribution services" inAtoZ="false"/> + <terms:term id="869" name="Courts of law" inAtoZ="false"/> + <terms:term id="870" name="Jury system" inAtoZ="false"/> + <terms:term id="871" name="Tribunals" inAtoZ="false"/> + <terms:term id="872" name="Crime prevention" inAtoZ="false"/> + <terms:term id="873" name="Crime reduction" inAtoZ="false"/> + <terms:term id="874" name="Domestic violence" inAtoZ="false"/> + <terms:term id="875" name="Murder" inAtoZ="false"/> + <terms:term id="876" name="Offenders" inAtoZ="false"/> + <terms:term id="877" name="Organised crime and terrorism" inAtoZ="false"/> + <terms:term id="878" name="Racially motivated crime" inAtoZ="false"/> + <terms:term id="879" name="Sex offences" inAtoZ="false"/> + <terms:term id="880" name="Smuggling" inAtoZ="false"/> + <terms:term id="881" name="Vehicle crime" inAtoZ="false"/> + <terms:term id="882" name="Victims of crime" ... [truncated message content] |
|
From: <mb...@re...> - 2005-02-25 12:55:24
|
Author: mbooth Date: 2005-02-25 13:53:52 +0100 (Fri, 25 Feb 2005) New Revision: 301 Added: ccm-ldn-terms/trunk/doc/esd/README-upgrading-domains.txt ccm-ldn-terms/trunk/doc/esd/files-1.04.txt ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2domain.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2domainLite.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchy.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchyLite.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2mapping.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2reversemapping.xsl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/RelatedItems2related.xsl Modified: ccm-ldn-terms/trunk/doc/esd/xslt-1.03/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl Log: Add version 1.04 domains Added: ccm-ldn-terms/trunk/doc/esd/README-upgrading-domains.txt =================================================================== --- ccm-ldn-terms/trunk/doc/esd/README-upgrading-domains.txt 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/README-upgrading-domains.txt 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,43 @@ +Release Notes for Terms Importer upgrade +Introduction + +These release notes relate to changes to the com.arsdigita.london.terms.importer package and related supporting files in the directory /usr/share/doc/ccm-ldn-terms-VERSION/esd. + +The purpose of these changes is to enable the importer to correctly import revised ESD controlled lists into a system that has an earlier version of the lists. Specifically a requirement was to upgrade a production version of APLAWS with a 1.02 version of ESD lists to have 1.04 lists. + +User Interface + +The upgraded importer tool has exactly the same interface as the earlier version. Therefore the tool works as documented in the APLAWS Admin Guide. One previously undocumented command is optional. To recap: + +First generate the XML files to import + +# cat files-1.04.txt | perl generate.pl + +Then import the domains and terms in those domains + +# ccm-run com.arsdigita.london.terms.Importer domain-* + +Then add the hierarchical relationships between the terms + +# ccm-run com.arsdigita.london.terms.Importer hierarchy-* + +Then add the mappings between the terms + +# ccm-run com.arsdigita.london.terms.Importer mapping-* + +Then add the related terms (this is not in the original documentation) + +# ccm-run com.arsdigita.london.terms.Importer related-* + +The most difficult part of this process is determining what should be the contents of the input file, in our case files-1.04.txt. This determines which XML files are generated. The released version of files-1.02.txt generated too many files, so that too many domains were imported into our APLAWS installation. In addition, a hierarchy mapping LGDL to LGSL was imported, followed by a related mapping of the same terms. This second import was superfluous and resulted in incorrect data. The files-1.04.txt was created with fewer entries than files-1.02.txt for this reason. + +It was necessary to edit one of the XSL files that transform the ESD toolkit XML into terms importer XML. The file LGDLLGSLItemsHierarchy2mixedHierarchy.xsl was changed to ensure that the LGSL terms added to the LGDL were all preferred terms. The same result could have been attained by changing the java code, but we decided to make as few changes to java code as possible. + +Changes to the Java code + +All changes were made only to classes in com.arsdigita.london.terms.importer . This package is only used to import the terms through the command line UI. No changes were made to the terms code , or to categories etc. +The classes changed were DomainBuilder HierarchyBuilder, MixedHierarchyBuilder and RelatedBuilder. +DomainBuilder was altered to update the Domain information. +The other classes were updated to delete the existing mappings between terms, and import the new ones. + + Added: ccm-ldn-terms/trunk/doc/esd/files-1.04.txt =================================================================== --- ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,17 @@ +# This file contains lines of the form: +# +# (ESD Toolkit XML, APLAWS import XML, ESD->APLAWS transform) +http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,hierarchy-lgcl-1.04.xml,xslt-1.04/ItemsHierarchy2hierarchy.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgclgclmapping.xml,mapping-lgcl-1.04-gcl-2.10.xml,xslt-1.04/Mapping2mapping.xsl +http://www.esd.org.uk/standards/termslist/1.04/termslist.xml,domain-lgcl-1.04.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgcllgslmapping.xml,mapping-lgcl-1.04-lgsl-2.01.xml,xslt-1.04/Mapping2mapping.xsl +http://www.esd.org.uk/standards/lgsl/2.01/lgsltermslist.xml,domain-lgsl-2.01.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/lgdl/2.01/lgdltermslist.xml,domain-lgdl-2.01.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/gcl/2.10/gcltermslist.xml,domain-gcl-2.10.xml,xslt-1.04/ControlledList2domain.xsl +#http://www.esd.org.uk/standards/gcl/2.10/gclhierarchy.xml,hierarchy-gcl-2.10.xml,xslt-1.04/ItemsHierarchy2hierarchy.xsl +http://www.esd.org.uk/standards/lgdl/2.01/lgdlhierarchy.xml,hierarchy-lgdl-2.01.xml,xslt-1.04/ItemsHierarchy2hierarchy.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgclrelatedterms.xml,related-lgcl-1.04.xml,xslt-1.04/RelatedItems2related.xsl +http://www.esd.org.uk/standards/lgdl/2.01/lgdllgslhierarchy.xml,hierarchy-lgdl-2.01-lgsl-2.01.xml,xslt-1.04/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgcllgslmapping.xml,mapping-lgsl-2.00-lgcl-1.04.xml,xslt-1.04/Mapping2reversemapping.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,domain-lgcl-lite-1.04.xml,xslt-1.04/ItemsHierarchy2domainLite.xsl +http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,hierarchy-lgcl-lite-1.04.xml,xslt-1.04/ItemsHierarchy2hierarchyLite.xsl Modified: ccm-ldn-terms/trunk/doc/esd/xslt-1.03/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.03/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.03/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -29,7 +29,7 @@ <terms:source> <terms:term id="{$sourceID}"/> </terms:source> - <terms:destination isDefault="{@Default}" isPreferred="{@Preferred}"> + <terms:destination isDefault="{@Default}" isPreferred="true"> <terms:term id="{@Id}"/> </terms:destination> </terms:orderedPair> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2domain.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2domain.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2domain.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="esd:ControlledList"> + <terms:domain + about="{@HomeLocation}" + key="{@ItemName}" + title="{@ListName}" + version="{@Version}" + released="{@VersionDate}"> + + <xsl:apply-templates select="esd:Item"/> + </terms:domain> + </xsl:template> + + <xsl:template match="esd:Item"> + <terms:term + id="{@Id}" + name="{esd:Name}"> + <xsl:if test="@AToZ"> + <xsl:attribute name="inAtoZ"> + <xsl:value-of select="@AToZ"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="esd:Shortcut"> + <xsl:attribute name="shortcut"> + <xsl:value-of select="esd:Shortcut"/> + </xsl:attribute> + </xsl:if> + </terms:term> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:template match="esd:ControlledList"> + <terms:hierarchy> + <terms:domain resource="{@HomeLocation}"/> + <xsl:apply-templates select="esd:Item"/> + + </terms:hierarchy> + </xsl:template> + + <xsl:template match="esd:Item"> + <terms:term id="{@Id}"/> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2domainLite.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2domainLite.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2domainLite.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="esd:ItemsHierarchy"> + <terms:domain + about="{@Resource}" + key="LGCL" + title="Local Government Category List" + version="{@Version}" + released="{esd:Metadata/esd:Date.Issued}"> + + <xsl:apply-templates select="esd:Item"/> + <xsl:apply-templates select="esd:Item/esd:NarrowerItems/esd:Item"/> + </terms:domain> + </xsl:template> + + <xsl:template match="esd:Item"> + <terms:term + id="{@Id}" + name="{esd:Name}" + inAtoZ="false"/> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchy.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchy.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="esd:ItemsHierarchy"> + <terms:hierarchy> + <terms:domain resource="{@Resource}"/> + <xsl:apply-templates select="esd:Item" mode="root"/> + <xsl:apply-templates select="esd:Item" mode="narrower"/> + </terms:hierarchy> + </xsl:template> + + <xsl:template match="esd:Item" mode="root"> + <terms:term id="{@Id}"/> + </xsl:template> + + <xsl:template match="esd:Item" mode="narrower"> + <xsl:if test="esd:NarrowerItems/esd:Item"> + <xsl:variable name="sourceID"> + <xsl:value-of select="@Id"/> + </xsl:variable> + <xsl:for-each select="esd:NarrowerItems/esd:Item"> + <terms:orderedPair> + <terms:source> + <terms:term id="{$sourceID}"/> + </terms:source> + <terms:destination isDefault="{@Default}" isPreferred="{@Category}"> + <terms:term id="{@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:for-each> + </xsl:if> + <xsl:apply-templates select="esd:NarrowerItems/esd:Item" mode="narrower"/> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchyLite.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchyLite.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ItemsHierarchy2hierarchyLite.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="esd:ItemsHierarchy"> + <terms:hierarchy> + <terms:domain resource="{@Resource}"/> + <xsl:apply-templates select="esd:Item" mode="root"/> + <xsl:apply-templates select="esd:Item" mode="narrower"/> + </terms:hierarchy> + </xsl:template> + + <xsl:template match="esd:Item" mode="root"> + <terms:term id="{@Id}"/> + </xsl:template> + + <xsl:template match="esd:Item" mode="narrower"> + <xsl:if test="esd:NarrowerItems/esd:Item"> + <xsl:variable name="sourceID"> + <xsl:value-of select="@Id"/> + </xsl:variable> + <xsl:for-each select="esd:NarrowerItems/esd:Item"> + <terms:orderedPair> + <terms:source> + <terms:term id="{$sourceID}"/> + </terms:source> + <terms:destination isDefault="{@Default}" isPreferred="{@Category}"> + <terms:term id="{@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:for-each> + </xsl:if> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/LGDLLGSLItemsHierarchy2mixedHierarchy.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="esd:ItemsHierarchy"> + <terms:mixedHierarchy> + <terms:source> + <terms:domain resource="{@LgdlResource}"/> + </terms:source> + <terms:destination> + <terms:domain resource="{@LgslResource}"/> + </terms:destination> + <xsl:apply-templates select="esd:LgdlItem"/> + </terms:mixedHierarchy> + </xsl:template> + + <xsl:template match="esd:LgdlItem"> + <xsl:if test="esd:NarrowerItems/esd:LgslItem"> + <xsl:variable name="sourceID"> + <xsl:value-of select="@Id"/> + </xsl:variable> + <xsl:for-each select="esd:NarrowerItems/esd:LgslItem"> + <terms:orderedPair> + <terms:source> + <terms:term id="{$sourceID}"/> + </terms:source> + <terms:destination isDefault="{@Default}" isPreferred="true"> + <terms:term id="{@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:for-each> + </xsl:if> + <xsl:apply-templates select="esd:NarrowerItems/esd:LgdlItem"/> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2mapping.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2mapping.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2mapping.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="/esd:ItemMappings"> + <terms:mapping> + <terms:source> + <terms:domain resource="{@FromResource}"/> + </terms:source> + <terms:destination> + <terms:domain resource="{@ToResource}"/> + </terms:destination> + <xsl:apply-templates select="esd:ItemMapping"/> + </terms:mapping> + </xsl:template> + + <xsl:template match="esd:ItemMapping"> + <xsl:for-each select="esd:From/esd:Item"> + <xsl:variable name="sourceID"> + <xsl:value-of select="@Id"/> + </xsl:variable> + <xsl:for-each select="../../esd:To/esd:Item"> + <terms:orderedPair> + <terms:source> + <terms:term id="{$sourceID}"/> + </terms:source> + <terms:destination> + <terms:term id="{@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:for-each> + </xsl:for-each> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2reversemapping.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2reversemapping.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/Mapping2reversemapping.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="/esd:ItemMappings"> + <terms:mapping> + <terms:source> + <terms:domain resource="{@ToResource}"/> + </terms:source> + <terms:destination> + <terms:domain resource="{@FromResource}"/> + </terms:destination> + <xsl:apply-templates select="esd:ItemMapping"/> + </terms:mapping> + </xsl:template> + + <xsl:template match="esd:ItemMapping"> + <xsl:for-each select="esd:To/esd:Item"> + <xsl:variable name="sourceID"> + <xsl:value-of select="@Id"/> + </xsl:variable> + <xsl:for-each select="../../esd:From/esd:Item"> + <terms:orderedPair> + <terms:source> + <terms:term id="{$sourceID}"/> + </terms:source> + <terms:destination> + <terms:term id="{@Id}"/> + </terms:destination> + </terms:orderedPair> + </xsl:for-each> + </xsl:for-each> + </xsl:template> + +</xsl:stylesheet> Added: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/RelatedItems2related.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/RelatedItems2related.xsl 2005-02-25 12:51:36 UTC (rev 300) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/RelatedItems2related.xsl 2005-02-25 12:53:52 UTC (rev 301) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:esd="http://www.esd.org.uk/standards" + xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" + exclude-result-prefixes="esd terms" + version="1.0"> + + <xsl:output method="xml"/> + + <xsl:template match="/esd:RelatedItems"> + <terms:related> + <terms:domain resource="{@Resource}"/> + + <xsl:apply-templates select="esd:RelatedItems"/> + </terms:related> + </xsl:template> + + <xsl:template match="esd:RelatedItems"> + <terms:unorderedPair> + <terms:first> + <terms:term id="{esd:Item[position()=1]/@Id}"/> + </terms:first> + <terms:second> + <terms:term id="{esd:Item[position()=2]/@Id}"/> + </terms:second> + </terms:unorderedPair> + </xsl:template> + +</xsl:stylesheet> |
18 messages has been excluded from this view by a project administrator.
