This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new 8a5ef498c Remove Any23 from Nutch
new 0ad935fdc Merge pull request #775 from tballison/NUTCH-2998
8a5ef498c is described below
commit 8a5ef498c5d930c367ca72547d07d4aaa2d55254
Author: tallison <[email protected]>
AuthorDate: Wed Sep 13 11:03:09 2023 -0400
Remove Any23 from Nutch
---
LICENSE-binary | 5 -
NOTICE-binary | 5 +-
NOTICE.txt | 2 +-
build.xml | 5 -
conf/nutch-default.xml | 16 -
default.properties | 4 +-
src/plugin/any23/build-ivy.xml | 47 -
src/plugin/any23/build.xml | 36 -
src/plugin/any23/howto_upgrade_any23.txt | 22 -
src/plugin/any23/ivy.xml | 49 -
src/plugin/any23/plugin.xml | 216 --
src/plugin/any23/sample/BBC_News_Scotland.html | 3780 --------------------
src/plugin/any23/sample/microdata_basic.html | 107 -
.../apache/nutch/any23/Any23IndexingFilter.java | 117 -
.../org/apache/nutch/any23/Any23ParseFilter.java | 171 -
.../java/org/apache/nutch/any23/package-info.java | 24 -
.../nutch/any23/TestAny23IndexingFilter.java | 81 -
.../apache/nutch/any23/TestAny23ParseFilter.java | 119 -
src/plugin/build.xml | 3 -
src/plugin/parse-tika/howto_upgrade_tika.txt | 2 -
20 files changed, 3 insertions(+), 4808 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 8e24a728e..5e11ec79c 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -327,11 +327,6 @@ net.sourceforge.owlapi:owlapi-impl
net.sourceforge.owlapi:owlapi-parsers
net.sourceforge.owlapi:owlapi-rio
net.sourceforge.owlapi:owlapi-tools
-org.apache.any23:apache-any23-api
-org.apache.any23:apache-any23-core
-org.apache.any23:apache-any23-csvutils
-org.apache.any23:apache-any23-encoding
-org.apache.any23:apache-any23-mime
org.apache.avro:avro
org.apache.commons:commons-collections4
org.apache.commons:commons-compress
diff --git a/NOTICE-binary b/NOTICE-binary
index 1aab2cb41..61a5c1d0d 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -29,7 +29,7 @@ code and source code.
The following provides more details on the included cryptographic software:
-The plugins parse-tika and any23 use Apache Tika and the Bouncy Castle
+The parse-tika plugin uses Apache Tika and the Bouncy Castle
generic encryption libraries for extracting text content and metadata
from encrypted PDF files. See <https://www.bouncycastle.org/> for more
details on Bouncy Castle and <https://tika.apache.org/> for details
@@ -46,9 +46,6 @@ on Apache Tika.
Apache projects
---------------
-Apache Any23 (https://any23.apache.org/)
- see https://github.com/apache/any23/blob/master/NOTICE.txt
-
Apache Avro (https://avro.apache.org)
see https://github.com/apache/avro/blob/master/NOTICE.txt
diff --git a/NOTICE.txt b/NOTICE.txt
index 939ddc803..4fdd968ab 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -29,7 +29,7 @@ code and source code.
The following provides more details on the included cryptographic software:
-The plugins parse-tika and any23 use Apache Tika and the Bouncy Castle
+The parse-tika plugin uses Apache Tika and the Bouncy Castle
generic encryption libraries for extracting text content and metadata
from encrypted PDF files. See <https://www.bouncycastle.org/> for more
details on Bouncy Castle and <https://tika.apache.org/> for details
diff --git a/build.xml b/build.xml
index 9326a8ba2..b44581405 100644
--- a/build.xml
+++ b/build.xml
@@ -202,7 +202,6 @@
<arg value="--no-module-directories" if:set="using.jdk.11"/>
<packageset dir="${src.dir}"/>
- <packageset dir="${plugins.dir}/any23/src/java/"/>
<packageset dir="${plugins.dir}/creativecommons/src/java"/>
<packageset dir="${plugins.dir}/feed/src/java"/>
<packageset dir="${plugins.dir}/headings/src/java"/>
@@ -687,7 +686,6 @@
<arg value="--no-module-directories" if:set="using.jdk.11"/>
<packageset dir="${src.dir}"/>
- <packageset dir="${plugins.dir}/any23/src/java/" />
<packageset dir="${plugins.dir}/creativecommons/src/java"/>
<packageset dir="${plugins.dir}/feed/src/java"/>
<packageset dir="${plugins.dir}/headings/src/java"/>
@@ -772,7 +770,6 @@
<classpath>
<fileset dir="${build.plugins}" >
<include name="**/*.jar"/>
- <exclude name="any23/javax.annotation-api*.jar"/>
</fileset>
</classpath>
@@ -1180,8 +1177,6 @@
<source path="${basedir}/src/java/" />
<source path="${basedir}/src/test/" output="build/test/classes" />
- <source path="${plugins.dir}/any23/src/java/" />
- <source path="${plugins.dir}/any23/src/test/" />
<source path="${plugins.dir}/creativecommons/src/java/" />
<source path="${plugins.dir}/creativecommons/src/test/" />
<source path="${plugins.dir}/feed/src/java/" />
diff --git a/conf/nutch-default.xml b/conf/nutch-default.xml
index e98bd5570..58455b338 100644
--- a/conf/nutch-default.xml
+++ b/conf/nutch-default.xml
@@ -1353,22 +1353,6 @@
</description>
</property>
-
-
-<!-- any23 plugin properties -->
-
-<property>
- <name>any23.extractors</name>
- <value>html-microdata</value>
- <description>Comma-separated list of Any23 extractors (a list of
extractors is available here:
http://any23.apache.org/getting-started.html)</description>
-</property>
-
-<property>
- <name>any23.content_types</name>
- <value>text/html,application/xhtml+xml</value>
- <description>Comma-separated list of content-types onto which Any23
extractors should be applied (see
http://www.iana.org/assignments/media-types/). If empty, all content-types are
supported.</description>
-</property>
-
<!-- moreindexingfilter plugin properties -->
<property>
diff --git a/default.properties b/default.properties
index df96199c1..17e0bffbb 100644
--- a/default.properties
+++ b/default.properties
@@ -210,6 +210,4 @@ plugins.misc=\
org.apache.nutch.collection*:\
org.apache.nutch.analysis.lang*:\
org.creativecommons.nutch*:\
- org.apache.nutch.microformats.reltag*:\
- org.apache.nutch.any23*
-
+ org.apache.nutch.microformats.reltag*:
diff --git a/src/plugin/any23/build-ivy.xml b/src/plugin/any23/build-ivy.xml
deleted file mode 100644
index 6c7c6b906..000000000
--- a/src/plugin/any23/build-ivy.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project name="any23" default="deps-jar" xmlns:ivy="antlib:org.apache.ivy.ant">
-
- <property name="ivy.dir" value="../../../ivy" />
- <property file="../../../default.properties" />
-
- <target name="download-ivy" unless="offline">
- <!-- download Ivy from web site so that it can be used even without any
special installation -->
- <available file="${ivy.jar}" property="ivy.jar.found"/>
- <antcall target="ivy-download-unchecked"/>
- </target>
-
- <target name="ivy-download-unchecked" unless="ivy.jar.found"
description="--> fetch any ivy file">
- <get src="${ivy.repo.url}" dest="${ivy.jar}" usetimestamp="true" />
- </target>
-
- <target name="init-ivy" depends="download-ivy">
- <!-- try to load ivy here from ivy home, in case the user has not already
dropped
- it into ant's lib dir (note that the latter copy will always take
precedence).
- We will not fail as long as local lib dir exists (it may be empty) and
- ivy is in at least one of ant's lib dir or the local lib dir. -->
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar}"/>
- <ivy:settings file="${ivy.dir}/ivysettings.xml" />
- </target>
-
- <target name="deps-jar" depends="init-ivy">
- <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]" sync="true"/>
- </target>
-
-</project>
diff --git a/src/plugin/any23/build.xml b/src/plugin/any23/build.xml
deleted file mode 100644
index 790b18548..000000000
--- a/src/plugin/any23/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project name="any23" default="jar-core">
-
- <import file="../build-plugin.xml"/>
-
- <!-- Deploy Unit test dependencies -->
- <target name="deps-test">
- <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/>
- <ant target="deploy" inheritall="false" dir="../protocol-file"/>
- </target>
-
- <!-- for junit test -->
- <mkdir dir="${build.test}/data"/>
- <copy todir="${build.test}/data">
- <fileset dir="sample">
- <include name="*.html"/>
- </fileset>
- </copy>
-
-</project>
diff --git a/src/plugin/any23/howto_upgrade_any23.txt
b/src/plugin/any23/howto_upgrade_any23.txt
deleted file mode 100644
index 32f9162f4..000000000
--- a/src/plugin/any23/howto_upgrade_any23.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Upgrade Any23 dependency in src/plugin/any23/ivy.xml
-
-2. Upgrade Any23's own dependencies in src/plugin/any23/plugin.xml
- To get the list of dependencies and their versions execute:
- $ cd src/plugin/any23/
- $ ant -f ./build-ivy.xml
- $ ls lib | sed 's/^/ <library name="/g' | sed 's/$/"\/>/g'
-
- In the plugin.xml replace all lines between
- <!-- Begin Any23 dependencies -->
- and
- <!-- End Any23 dependencies -->
- with the output of the command above.
-
-3. Remove the locally "installed" dependencies in src/plugin/any23/lib/:
-
- $ rm -rf lib/
-
-4. Build Nutch and run all unit tests:
-
- $ cd ../../../
- $ ant clean runtime test
diff --git a/src/plugin/any23/ivy.xml b/src/plugin/any23/ivy.xml
deleted file mode 100644
index 3b755ee3f..000000000
--- a/src/plugin/any23/ivy.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ivy-module version="1.0">
- <info organisation="org.apache.nutch" module="${ant.project.name}">
- <license name="Apache 2.0"/>
- <ivyauthor name="Apache Nutch Team" url="https://nutch.apache.org/"/>
- <description>
- Apache Nutch
- </description>
- </info>
-
- <configurations>
- <include file="../../../ivy/ivy-configurations.xml"/>
- </configurations>
-
- <publications>
- <!--get the artifact from our module name-->
- <artifact conf="master"/>
- </publications>
-
- <dependencies>
- <dependency org="org.apache.any23" name="apache-any23-core" rev="2.7"
conf="*->default">
- <exclude org="org.apache.commons" name="commons-lang" />
- <exclude org="org.apache.commons" name="commons-compress" />
- <exclude org="org.slf4j" name="slf4j-log4j12" />
- <exclude org="org.slf4j" name="slf4j-api" />
- <exclude org="xerces" />
- </dependency>
- <dependency org="org.apache.commons" name="commons-rdf-api" rev="0.5.0"
conf="*->default"/>
- </dependencies>
-
-</ivy-module>
diff --git a/src/plugin/any23/plugin.xml b/src/plugin/any23/plugin.xml
deleted file mode 100644
index dae8c47aa..000000000
--- a/src/plugin/any23/plugin.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<plugin
- id="any23"
- name="Apache Any23 Parser/Indexer"
- version="1.0.0"
- provider-name="nutch.org">
-
- <runtime>
- <library name="any23.jar">
- <export name="*"/>
- </library>
- <!-- Begin Any23 dependencies -->
- <library name="apache-any23-api-2.7.jar"/>
- <library name="apache-any23-core-2.7.jar"/>
- <library name="apache-any23-csvutils-2.7.jar"/>
- <library name="apache-any23-encoding-2.7.jar"/>
- <library name="apache-any23-mime-2.7.jar"/>
- <library name="apache-mime4j-core-0.8.4.jar"/>
- <library name="apache-mime4j-dom-0.8.4.jar"/>
- <library name="asm-9.2.jar"/>
- <library name="bcmail-jdk15on-1.70.jar"/>
- <library name="bcpkix-jdk15on-1.70.jar"/>
- <library name="bcutil-jdk15on-1.70.jar"/>
- <library name="biweekly-0.6.6.jar"/>
- <library name="boilerpipe-1.1.0.jar"/>
- <library name="caffeine-2.8.1.jar"/>
- <library name="checker-qual-3.1.0.jar"/>
- <library name="commons-codec-1.15.jar"/>
- <library name="commons-collections4-4.4.jar"/>
- <library name="commons-csv-1.9.0.jar"/>
- <library name="commons-exec-1.3.jar"/>
- <library name="commons-io-2.11.0.jar"/>
- <library name="commons-lang3-3.12.0.jar"/>
- <library name="commons-logging-1.2.jar"/>
- <library name="commons-math3-3.6.1.jar"/>
- <library name="commons-rdf-api-0.5.0.jar"/>
- <library name="commons-text-1.9.jar"/>
- <library name="curvesapi-1.06.jar"/>
- <library name="dd-plist-1.23.jar"/>
- <library name="dec-0.1.2.jar"/>
- <library name="error_prone_annotations-2.3.4.jar"/>
- <library name="f8-1.1.jar"/>
- <library name="failureaccess-1.0.1.jar"/>
- <library name="fluent-hc-4.5.13.jar"/>
- <library name="fontbox-2.0.25.jar"/>
- <library name="guava-30.1.1-jre.jar"/>
- <library name="hppcrt-0.7.5.jar"/>
- <library name="httpclient-4.5.13.jar"/>
- <library name="httpclient-cache-4.5.13.jar"/>
- <library name="httpclient-osgi-4.5.13.jar"/>
- <library name="httpcore-4.4.15.jar"/>
- <library name="httpcore-nio-4.4.14.jar"/>
- <library name="httpcore-osgi-4.4.14.jar"/>
- <library name="httpmime-4.5.13.jar"/>
- <library name="istack-commons-runtime-3.0.12.jar"/>
- <library name="jackcess-4.0.1.jar"/>
- <library name="jackcess-encrypt-4.0.1.jar"/>
- <library name="jackson-annotations-2.11.4.jar"/>
- <library name="jackson-core-2.12.1.jar"/>
- <library name="jackson-databind-2.11.4.jar"/>
- <library name="jai-imageio-core-1.4.0.jar"/>
- <library name="jakarta.activation-1.2.2.jar"/>
- <library name="jakarta.xml.bind-api-2.3.3.jar"/>
- <library name="java-libpst-0.9.3.jar"/>
- <library name="javax.activation-api-1.2.0.jar"/>
- <library name="javax.inject-1.jar"/>
- <library name="jaxb-api-2.3.1.jar"/>
- <library name="jaxb-runtime-2.3.5.jar"/>
- <library name="jbig2-imageio-3.0.3.jar"/>
- <library name="jcl-over-slf4j-1.7.35.jar"/>
- <library name="jcommander-1.82.jar"/>
- <library name="jdom2-2.0.6.1.jar"/>
- <library name="jempbox-1.8.16.jar"/>
- <library name="jhighlight-1.0.3.jar"/>
- <library name="jmatio-1.5.jar"/>
- <library name="jsonld-java-0.13.4.jar"/>
- <library name="jsoup-1.14.3.jar"/>
- <library name="jsr305-3.0.2.jar"/>
- <library name="juniversalchardet-1.0.3.jar"/>
- <library name="junrar-7.4.1.jar"/>
- <library
name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
- <library name="log4j-api-2.17.1.jar"/>
- <library name="log4j-core-2.17.1.jar"/>
- <library name="log4j-slf4j-impl-2.17.1.jar"/>
- <library name="mapdb-1.0.8.jar"/>
- <library name="metadata-extractor-2.16.0.jar"/>
- <library name="owlapi-api-5.1.20.jar"/>
- <library name="owlapi-apibinding-5.1.20.jar"/>
- <library name="owlapi-impl-5.1.20.jar"/>
- <library name="owlapi-oboformat-5.1.20.jar"/>
- <library name="owlapi-parsers-5.1.20.jar"/>
- <library name="owlapi-rio-5.1.20.jar"/>
- <library name="owlapi-tools-5.1.20.jar"/>
- <library name="parso-2.0.14.jar"/>
- <library name="pdfbox-2.0.25.jar"/>
- <library name="pdfbox-debugger-2.0.25.jar"/>
- <library name="pdfbox-tools-2.0.25.jar"/>
- <library name="poi-5.2.0.jar"/>
- <library name="poi-ooxml-5.2.0.jar"/>
- <library name="poi-ooxml-lite-5.2.0.jar"/>
- <library name="poi-scratchpad-5.2.0.jar"/>
- <library name="rdf4j-http-client-3.7.4.jar"/>
- <library name="rdf4j-http-protocol-3.7.4.jar"/>
- <library name="rdf4j-model-3.7.4.jar"/>
- <library name="rdf4j-model-api-3.7.4.jar"/>
- <library name="rdf4j-model-vocabulary-3.7.4.jar"/>
- <library name="rdf4j-query-3.7.4.jar"/>
- <library name="rdf4j-queryalgebra-evaluation-3.7.4.jar"/>
- <library name="rdf4j-queryalgebra-model-3.7.4.jar"/>
- <library name="rdf4j-queryparser-api-3.7.4.jar"/>
- <library name="rdf4j-queryparser-sparql-3.7.4.jar"/>
- <library name="rdf4j-queryresultio-api-3.7.4.jar"/>
- <library name="rdf4j-queryresultio-binary-3.7.4.jar"/>
- <library name="rdf4j-queryresultio-sparqlxml-3.7.4.jar"/>
- <library name="rdf4j-repository-api-3.7.4.jar"/>
- <library name="rdf4j-repository-sail-3.7.4.jar"/>
- <library name="rdf4j-repository-sparql-3.7.4.jar"/>
- <library name="rdf4j-rio-api-3.7.4.jar"/>
- <library name="rdf4j-rio-binary-3.7.4.jar"/>
- <library name="rdf4j-rio-datatypes-3.7.4.jar"/>
- <library name="rdf4j-rio-hdt-3.7.4.jar"/>
- <library name="rdf4j-rio-jsonld-3.7.4.jar"/>
- <library name="rdf4j-rio-languages-3.7.4.jar"/>
- <library name="rdf4j-rio-n3-3.7.4.jar"/>
- <library name="rdf4j-rio-nquads-3.7.4.jar"/>
- <library name="rdf4j-rio-ntriples-3.7.4.jar"/>
- <library name="rdf4j-rio-rdfjson-3.7.4.jar"/>
- <library name="rdf4j-rio-rdfxml-3.7.4.jar"/>
- <library name="rdf4j-rio-trig-3.7.4.jar"/>
- <library name="rdf4j-rio-trix-3.7.4.jar"/>
- <library name="rdf4j-rio-turtle-3.7.4.jar"/>
- <library name="rdf4j-sail-api-3.7.4.jar"/>
- <library name="rdf4j-sail-base-3.7.4.jar"/>
- <library name="rdf4j-sail-memory-3.7.4.jar"/>
- <library name="rdf4j-util-3.7.4.jar"/>
- <library name="rome-1.18.0.jar"/>
- <library name="rome-utils-1.18.0.jar"/>
- <library name="semargl-core-0.7.jar"/>
- <library name="semargl-rdf-0.7.jar"/>
- <library name="semargl-rdf4j-0.7.jar"/>
- <library name="semargl-rdfa-0.7.jar"/>
- <library name="snakeyaml-1.30.jar"/>
- <library name="SparseBitSet-1.2.jar"/>
- <library name="tagsoup-1.2.1.jar"/>
- <library name="tika-core-2.3.0.jar"/>
- <library name="tika-parser-apple-module-2.3.0.jar"/>
- <library name="tika-parser-audiovideo-module-2.3.0.jar"/>
- <library name="tika-parser-cad-module-2.3.0.jar"/>
- <library name="tika-parser-code-module-2.3.0.jar"/>
- <library name="tika-parser-crypto-module-2.3.0.jar"/>
- <library name="tika-parser-digest-commons-2.3.0.jar"/>
- <library name="tika-parser-font-module-2.3.0.jar"/>
- <library name="tika-parser-html-commons-2.3.0.jar"/>
- <library name="tika-parser-html-module-2.3.0.jar"/>
- <library name="tika-parser-image-module-2.3.0.jar"/>
- <library name="tika-parser-mail-commons-2.3.0.jar"/>
- <library name="tika-parser-mail-module-2.3.0.jar"/>
- <library name="tika-parser-microsoft-module-2.3.0.jar"/>
- <library name="tika-parser-miscoffice-module-2.3.0.jar"/>
- <library name="tika-parser-news-module-2.3.0.jar"/>
- <library name="tika-parser-ocr-module-2.3.0.jar"/>
- <library name="tika-parser-pdf-module-2.3.0.jar"/>
- <library name="tika-parser-pkg-module-2.3.0.jar"/>
- <library name="tika-parsers-standard-package-2.3.0.jar"/>
- <library name="tika-parser-text-module-2.3.0.jar"/>
- <library name="tika-parser-xml-module-2.3.0.jar"/>
- <library name="tika-parser-xmp-commons-2.3.0.jar"/>
- <library name="tika-parser-zip-commons-2.3.0.jar"/>
- <library name="txw2-2.3.5.jar"/>
- <library name="vinnie-2.0.2.jar"/>
- <library name="vorbis-java-core-0.8.jar"/>
- <library name="vorbis-java-tika-0.8.jar"/>
- <library name="xmlbeans-5.0.3.jar"/>
- <library name="xmpbox-2.0.25.jar"/>
- <library name="xmpcore-6.1.11.jar"/>
- <library name="xz-1.9.jar"/>
- <!-- End Any23 dependencies -->
- </runtime>
-
- <requires>
- <import plugin="nutch-extensionpoints"/>
- </requires>
-
- <extension id="org.apache.nutch.any23.Any23ParseFilter"
- name="Any23 parser"
- point="org.apache.nutch.parse.HtmlParseFilter">
-
- <implementation id="Any23Parser"
- class="org.apache.nutch.any23.Any23ParseFilter"/>
- </extension>
-
- <extension id="org.apache.nutch.any23.Any23IndexingFilter"
- name="Any23 indexing filter"
- point="org.apache.nutch.indexer.IndexingFilter">
-
- <implementation id="Any23IndexingFilter"
- class="org.apache.nutch.any23.Any23IndexingFilter"/>
- </extension>
-
-</plugin>
diff --git a/src/plugin/any23/sample/BBC_News_Scotland.html
b/src/plugin/any23/sample/BBC_News_Scotland.html
deleted file mode 100644
index d7cb10a82..000000000
--- a/src/plugin/any23/sample/BBC_News_Scotland.html
+++ /dev/null
@@ -1,3780 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<html class=" blq-js" xmlns="http://www.w3.org/1999/xhtml"
xmlns:og="http://opengraphprotocol.org/schema/"
xmlns:rnews="http://iptc.org/std/rNews/2011-10-07#" xml:lang="en-GB"><!-- THIS
FILE CONFIGURES SHARED HIGHWEB STATIC ASSETS --><!-- mapping_news.inc --><!--
THIS FILE CONFIGURES NEWS STATIC ASSETS --><!-- THIS FILE CONFIGURES VOTE 2012
STATIC ASSETS --><!-- hi/shared/head_initial.inc --><!-- IGOR News --><head
profile="http://dublincore.org/documents/dcq-html/" resource="http://ww [...]
- <meta http-equiv="X-UA-Compatible" content="IE=8">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>BBC News - Scotland</title>
- <meta name="Description" content="Get the latest Scottish news from
BBC Scotland: breaking news, analysis, features and debate plus audio and video
coverage on topical issues from around Scotland">
- <meta property="rnews:description" content="Get the latest Scottish
news from BBC Scotland: breaking news, analysis, features and debate plus audio
and video coverage on topical issues from around Scotland">
- <meta name="OriginalPublicationDate" content="2014/03/31
13:53:03">
- <meta property="rnews:datePublished" content="2014/03/31 13:53:03">
- <meta name="UKFS_URL" content="/news/scotland/">
- <meta name="Headline" content="INDEX ">
- <meta property="rnews:headline" content="INDEX ">
- <meta name="IFS_URL" content="/news/scotland/">
- <meta name="Section" content="Scotland">
- <meta name="contentFlavor" content="INDEX">
- <meta name="CPS_ID" content="10059375">
- <meta name="CPS_SITE_NAME" content="BBC News">
- <meta name="CPS_SECTION_PATH" content="Scotland">
- <meta name="CPS_ASSET_TYPE" content="IDX">
- <meta name="CPS_PLATFORM" content="HighWeb">
- <meta name="CPS_AUDIENCE" content="Domestic">
- <meta property="rnews:creator" content="http://www.bbc.co.uk#org">
-
- <meta property="og:title" content="INDEX ">
- <meta property="og:type" content="article">
- <meta property="og:url"
content="http://www.bbc.co.uk/news/scotland/">
- <meta property="og:site_name" content="BBC News">
- <meta property="og:image"
content="http://newsimg.bbc.co.uk/media/images/67373000/jpg/_67373987_09f1654a-e583-4b5f-bfc4-f05850c6d3ce.jpg">
-
- <meta name="bbcsearch_noindex" content="atom">
-
-
- <link rel="canonical" href="http://www.bbc.co.uk/news/scotland/">
-<link rel="alternate" hreflang="en" href="http://www.bbc.com/news/scotland/">
-<link rel="alternate" hreflang="en-gb"
href="http://www.bbc.co.uk/news/scotland/">
-
-
- <link
href="http://feeds.bbci.co.uk/news/scotland/rss.xml" rel="alternate"
type="application/rss+xml" title="BBC News - Scotland">
-
-
-
- <!-- hi/news/head_first.inc -->
-
-<!-- Chartbeat Web Analytics code - start -->
-<script type="text/javascript">var _sf_startpt=(new Date()).getTime()</script>
-<!-- Chartbeat Web Analytics code - end -->
-
-<meta name="application-name" content="BBC News">
-<meta name="msapplication-TileImage"
content="/img/1_0_3/cream/hi/news/bbc-news-pin.png">
-<meta name="msapplication-TileColor" content="#CC0101">
-
-
-<meta name="twitter:card" value="summary">
-
- <!-- Project IGOR - Barlesque redirection logic - START -->
-
-
- <script>
- /*<![CDATA[*/
- window.bbcredirection = {
-
- device: true,
- geo: true
-
- }
- /*]]>*/
- </script>
-
-<!-- Project IGOR - Barlesque redirection logic - END -->
-
-
-<!-- PULSE_ENABLED:yes -->
-
-<!-- vars inc blq_cachebust_journalism 1.21.17 -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <meta http-equiv="X-UA-Compatible" content="IE=8">
- <link rel="schema.dcterms" href="http://purl.org/dc/terms/"> <link
rel="index" href="http://www.bbc.co.uk/a-z/" title="A to Z"> <link
rel="copyright" href="http://www.bbc.co.uk/terms/" title="Terms of Use"> <link
rel="icon" href="http://www.bbc.co.uk/favicon.ico" type="image/x-icon"> <meta
name="viewport" content="width = 996">
-
-<script type="text/javascript">/*<![CDATA[*/
-window.orb = window.orb || {};
-(function() {
- 'use strict';
- window.fig = window.fig || {};
- window.fig.manager = {
- include: function(w) {
- w = w || window;
- var d = w.document,
- c = d.cookie,
- f = c.match(/ckns_orb_fig=([^;]+)/);
-
- if ( !f && c.indexOf('ckns_orb_nofig=1') > -1 ) {
- this.setFig(w, {no:1});
- }
- else {
- if (f) {
- eval('f = ' + decodeURIComponent(RegExp.$1) + ';')
- this.setFig(w, f);
- }
- d.write('<script
src="https://ssl.live.bbc.co.uk/frameworks/fig/1/fig.js"><'+'/script>');
- }
-
- },
- confirm: function(w) {
- w = w || window;
- if (w.orb && w.orb.fig && w.orb.fig('no')) {
- this.setFigCookie(w);
- }
-
- if (w.orb === undefined || w.orb.fig === undefined) {
- this.setFig(w, {no:1});
- this.setFigCookie(w);
- }
- },
- setFigCookie: function(w) {
- w.document.cookie = 'ckns_orb_nofig=1; expires=' + new Date(new
Date().getTime() + 1000 * 60 * 10).toGMTString() + ';';
- },
- setFig: function(w, f){
- (function(){var o=f;w.orb=w.orb||{};w.orb.fig=function(k){return
(arguments.length)? o[k]:o};})();
- }
- }
-})();
-fig.manager.include();
-/*]]>*/</script><script src="BBC_News_Scotland_files/fig.js"></script>
-<script type="text/javascript"> fig.manager.confirm(); </script>
-
- <link rel="stylesheet" type="text/css"
href="BBC_News_Scotland_files/main.css"> <script
type="text/javascript">/*<![CDATA[*/
(function(undefined){if(!window.bbc){window.bbc={}}var
ROLLING_PERIOD_DAYS=30;window.bbc.Mandolin=function(id,segments,opts){var
now=new
Date().getTime(),storedItem,DEFAULT_START=now,DEFAULT_RATE=1,COOKIE_NAME="ckpf_mandolin";opts=opts||{};this._id=id;this._segmentSet=segments;this._store=new
window.window.bbc.Mandolin.Storage(COOKIE_NAME);this._opts=opts;this._r [...]
- <script type="text/javascript"
src="BBC_News_Scotland_files/require.js"></script> <script
type="text/javascript"> bbcRequireMap =
{"jquery-1":"http://static.bbci.co.uk/frameworks/jquery/0.3.0/sharedmodules/jquery-1.7.2",
"jquery-1.4":"http://static.bbci.co.uk/frameworks/jquery/0.3.0/sharedmodules/jquery-1.4",
"jquery-1.9":"http://static.bbci.co.uk/frameworks/jquery/0.3.0/sharedmodules/jquery-1.9.1",
"swfobject-2":"http://static.bbci.co.uk/frameworks/swfobject/0.1.10/sharedmodules/swf
[...]
-
-<!--[if IE 6]>
- <script type="text/javascript">
- try {
- document.execCommand("BackgroundImageCache",false,true);
- } catch(e) {}
- </script>
- <style type="text/css">
- /* Use filters for IE6 */
- #blq-blocks a {
- background-image: none;
- filter:
progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://static.bbci.co.uk/frameworks/barlesque/2.60.1/desktop/3.5//img/blq-blocks_white_alpha.png',
sizingMethod='image');
- }
- .blq-masthead-focus #blq-blocks a,
- .blq-mast-text-dark #blq-blocks a {
- background-image: none;
- filter:
progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://static.bbci.co.uk/frameworks/barlesque/2.60.1/desktop/3.5//img/blq-blocks_grey_alpha.png',
sizingMethod='image');
- }
- #blq-nav-search button span {
- background-image: none;
- filter:
progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://static.bbci.co.uk/frameworks/barlesque/2.60.1/desktop/3.5//img/blq-search_grey_alpha.png',
sizingMethod='image');
- }
- #blq-nav-search button img {
- position: absolute;
- left: -999em;
- }
- </style>
-<![endif]-->
-
-<!--[if (IE 7])|(IE 8)>
- <style type="text/css">
- .blq-clearfix {
- display: inline-block;
- }
- </style>
-<![endif]-->
-
-<script type="text/javascript">
- blq.setEnvironment('live'); if (blq.setLabel)
blq.setLabel('searchSuggestion', "Search"); if (!
/bbc\.co\.uk$/i.test(window.location.hostname) ) {
document.documentElement.className += ' blq-not-bbc-co-uk'; } </script>
-
- <script type="text/javascript"> /*<![CDATA[*/ function oqsSurveyManager(w,
flag) { var defaultThreshold = 0.7, usePulseThreshold = (flag === 'OFF')? 1 :
defaultThreshold, activeThreshold; w.oqs = w.oqs || {}; if (
w.document.cookie.match(/(?:^|; *)ckns_oqs_usePulseThreshold=([\d.]+)/) ) {
activeThreshold = RegExp.$1; } else if (typeof w.oqs_usePulseThreshold !==
'undefined') { activeThreshold = w.oqs_usePulseThreshold; } else {
activeThreshold = usePulseThreshold; } w.oqs.usePulse = ( [...]
- <script type="text/javascript"> window.pulse = { init: function(){/*stub*/}
}; if (!window.oqs || oqs.usePulse) { document.write('<script
type="text/javascript"
src="http://static.bbci.co.uk/frameworks/pulsesurvey/0.10.1/script/pulse.js"><'+'/script>');
document.write('<script type="text/javascript"
src="http://www.bbc.co.uk/survey/pulse/conf.js"><'+'/script>'); }
</script><script type="text/javascript"
src="BBC_News_Scotland_files/pulse.js"></script><script
src="BBC_News_Scotland_files [...]
-
-
-
-
-
- <!-- shared/head -->
-<meta http-equiv="imagetoolbar" content="no">
-<!--[if !(lt IE 6)]>
- <link rel="stylesheet" type="text/css"
href="http://news.bbcimg.co.uk/view/3_0_19/cream/hi/shared/type.css" />
-
-
- <link rel="stylesheet" type="text/css" media="screen"
href="http://news.bbcimg.co.uk/view/3_0_19/cream/hi/shared/global.css" />
-
-
- <link rel="stylesheet" type="text/css" media="print"
href="http://news.bbcimg.co.uk/view/3_0_19/cream/hi/shared/print.css" />
-
- <link rel="stylesheet" type="text/css" media="screen and
(max-device-width: 976px)"
href="http://news.bbcimg.co.uk/view/3_0_19/cream/hi/shared/mobile.css" />
-
-
-
-
-<link rel="stylesheet" type="text/css"
href="http://news.bbcimg.co.uk/view/3_0_19/cream/hi/shared/components/components.css"
/>
-
-<![endif]-->
-<!--[if !IE]>-->
- <link rel="stylesheet" type="text/css"
href="BBC_News_Scotland_files/type.css">
-
-
- <link rel="stylesheet" type="text/css" media="screen"
href="BBC_News_Scotland_files/global.css">
-
-
- <link rel="stylesheet" type="text/css" media="print"
href="BBC_News_Scotland_files/print.css">
-
- <link rel="stylesheet" type="text/css" media="screen and
(max-device-width: 976px)" href="BBC_News_Scotland_files/mobile.css">
-
-
-
-
-<link rel="stylesheet" type="text/css"
href="BBC_News_Scotland_files/components.css">
-
-<!--<![endif]-->
-<script type="text/javascript">
-/*<![CDATA[*/
-gloader.load(["glow","1","glow.dom"],{onLoad:function(glow){glow.dom.get("html").addClass("blq-js")}});
-gloader.load(["glow","1","glow.dom"],{onLoad:function(glow){glow.ready(function(){if
(glow.env.gecko){var gv = glow.env.version.split(".");for (var
i=gv.length;i<4;i++){gv[i]=0;}if((gv[0]==1 && gv[1]==9 && gv[2]==0)||(gv[0]==1
&&
gv[1]<9)||(gv[0]<1)){glow.dom.get("body").addClass("firefox-older-than-3-5");}}});}});
-
-window.disableFacebookSDK=true;
-if (window.location.pathname.indexOf('+')>=0){window.disableFacebookSDK=true;}
-
-/*]]>*/
-</script><script type="text/javascript"
src="BBC_News_Scotland_files/core_002.js" class="gloaded sync"></script>
-
-<script type="text/javascript"
src="BBC_News_Scotland_files/locator.js"></script><script
type="text/javascript" src="BBC_News_Scotland_files/widgets.js" class="gloaded
sync"></script><link class="gloaded async" type="text/css" rel="stylesheet"
href="BBC_News_Scotland_files/widgets.css">
-
-
-<script type="text/javascript"
src="BBC_News_Scotland_files/bbc_fmtj.js"></script>
-
-<script type="text/javascript">
-<!--
- bbc.fmtj.page = {
- serverTime: 1396274136000,
- editionToServe: 'domestic',
- queryString: null,
- section: 'scotland',
- sectionPath: '/Scotland',
- siteName: 'BBC News',
- siteToServe: 'news',
- siteVersion: 'cream',
- storyId: '10059375',
- assetType: 'index',
- uri: '/news/scotland/',
- country: 'gb',
- masthead: false,
- adKeyword: null,
- templateVersion: 'v1_0'
- }
--->
-</script>
-<script type="text/javascript"
src="BBC_News_Scotland_files/bbc_fmtj_common.js"></script>
-
-
-<script
type="text/javascript">$useMap({map:"http://news.bbcimg.co.uk/js/map/map_0_0_33.js"});</script><script
type="text/javascript" src="BBC_News_Scotland_files/map_0_0_33.js"></script>
-
-<script
type="text/javascript">$loadView("0.0",["bbc.fmtj.view"]);</script><script
type="text/javascript" src="BBC_News_Scotland_files/view.js" class="gloaded
sync"></script>
-
-<script type="text/javascript">$render("livestats-heatmap");</script>
-
-
-<script type="text/javascript"
src="BBC_News_Scotland_files/bbc_fmtj_config.js"></script>
-
-
-
-
-<script type="text/javascript">
- //<![CDATA[
- require(['jquery-1'], function($){
-
- // set up EMP once it's loaded
- var setUp = function(){
- // use our own pop out page
-
embeddedMedia.setPopoutUrl('/player/emp/2_0_55/popout/pop.stm');
-
- // store EMP's notifyParent function
- var oldNotifyParent = embeddedMedia.console.notifyParent;
- // use our own to add livestats to popout
- embeddedMedia.console.notifyParent = function(childWin){
- oldNotifyParent(childWin);
- // create new live stats url
- var liveStatsUrl =
bbc.fmtj.av.emp.liveStatsForPopout($('#livestats').attr('src'));
- var webBug = $('<img />', {
- id: 'livestats',
- src: liveStatsUrl
- });
- // append it to popout
- $(childWin.document).find('body').append(webBug);
- }
- }
-
- // check if console is available to manipulate
- if(window.embeddedMedia && window.embeddedMedia.console){
- setUp();
- }
- // otherwise emp is still loading, so add event listener
- else{
- $(document).bind('empReady', function(){
- setUp();
- });
- }
- });
- //]]>
-</script>
-
-
-
- <!-- get BUMP from cdn -->
- <script type="text/javascript"
src="BBC_News_Scotland_files/bump.js"></script>
-
-<!-- load glow and required modules -->
-<script type="text/javascript">
- //<![CDATA[
- gloader.load(['glow', '1', 'glow.dom']);
- //]]>
-</script>
-
-
-
- <!-- pull in our emp code -->
- <script type="text/javascript"
src="BBC_News_Scotland_files/emp.js"></script>
- <!-- pull in compatibility.js -->
- <script type="text/javascript"
src="BBC_News_Scotland_files/compatibility.js"></script>
-
-
-<script type="text/javascript">
- //<![CDATA[
-
-
-
-
-
-
-
-
-
-
- // set site specific config
-
- bbc.fmtj.av.emp.configs.push('news');
-
-
- // when page loaded, write all created emps
- glow.ready(function(){
- if(typeof bbcdotcom !== 'undefined' && bbcdotcom.av &&
bbcdotcom.av.emp){
- bbcdotcom.av.emp.configureAll();
- }
- embeddedMedia.each(function(emp){
- emp.set('enable3G', true);
- emp.setMediator('href',
'{protocol}://{host}/mediaselector/5/select/version/2.0/mediaset/{mediaset}/vpid/{id}');
- });
- embeddedMedia.writeAll();
- // mark the emps as loaded
- bbc.fmtj.av.emp.loaded = true;
-
-
- });
- //]]>
-</script>
-<!-- Check for advertising testing -->
-
-<meta name="viewport" content="width = 996">
-
-
-
- <!-- shared/head_index -->
-<!-- THESE STYLESHEETS VARY ACCORDING TO PAGE CONTENT -->
-
-<link rel="stylesheet" type="text/css" media="screen"
href="BBC_News_Scotland_files/index.css">
-
-
-<!-- js index view -->
-<script
type="text/javascript">$loadView("0.0",["bbc.fmtj.view.news.index"]);</script><script
src="BBC_News_Scotland_files/jquery-1.js" data-requiremodule="jquery-1"
data-requirecontext="_" async="" charset="utf-8"
type="text/javascript"></script><script src="BBC_News_Scotland_files/demi-1.js"
data-requiremodule="demi-1" data-requirecontext="_" async="" charset="utf-8"
type="text/javascript"></script><script type="text/javascript"
src="BBC_News_Scotland_files/news-index.js" class="gloade [...]
-
-
-
-
- <!-- #CREAM hi news domestic head.inc -->
-
-<script type="text/javascript">
- if(undefined !== bbc && undefined !== bbc.fmtj){
- bbc.fmtj.makeNewsSurveyConfig =
function(surveyId,probabilityRate){
- if(surveyId !== undefined){
- pulse.localSurvey = {
- 'active' : true,
- 'URLFormat' :
'http://ecustomeropinions.com/survey/survey.php?sid='+ surveyId,
- 'probability' : probabilityRate,
- 'translations' : {
- 'intro' : 'We are always
looking to improve the site and your opinions count.',
- 'question' : 'Do you have a few
minutes to tell us what you think about this site?'
- }
- }
-
-
- }
- };
- }
- </script>
-
-
-
-
-
-
- <!-- is suitable for ads adding isadvertise ... -->
-
-
-
-
-
-
-
-<script type="text/javascript">/*<![CDATA[*/if(bbcdotcom===undefined){var
bbcdotcom={init:function(a){},objects:function(a){return
false},domLoaded:false,data:{ads:0,stats:0,statsProvider:null},adverts:{slot:function(b,a){},layout:{reset:function(){}}},config:{isActive:function(a){return
false}},addLoadEvent:function(a){var b=window.onload;if(typeof
window.onload!="function"){window.onload=a}else{window.onload=function(){if(b){b()}a()}}}}}bbcdotcom.objects=function(d,e,f){var
b,c,a;b=d.s [...]
-<meta name="application-name" content="BBC">
-<meta name="msapplication-tooltip" content="Explore the BBC, for latest news,
sport and weather, TV & radio schedules and highlights, with nature, food,
comedy, children's programmes and much more">
-
- <meta name="msapplication-starturl"
content="http://www.bbc.com/news/?ocid=global-news-pinned-ie9">
-
-<meta name="msapplication-window" content="width=1024;height=768">
-<meta name="msapplication-task" content="name=BBC
Home;action-uri=http://www.bbc.com/?ocid=global-homepage-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<meta name="msapplication-task" content="name=BBC
News;action-uri=http://www.bbc.com/news/?ocid=global-news-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<meta name="msapplication-task" content="name=BBC
Sport;action-uri=http://www.bbc.com/sport/0/?ocid=global-sport-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<meta name="msapplication-task" content="name=BBC
Future;action-uri=http://www.bbc.com/future?ocid=global-future-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<meta name="msapplication-task" content="name=BBC
Travel;action-uri=http://www.bbc.com/travel?ocid=global-travel-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<meta name="msapplication-task" content="name=BBC
Weather;action-uri=http://www.bbc.co.uk/weather/?ocid=global-weather-pinned-ie9;icon-uri=http://news.bbcimg.co.uk/shared/img/bbccom/favicon_16.ico">
-<!-- BBCCOM client-side -->
-
-
-<style type="text/css">.bbccom_display_none{display:none;}</style>
-
-
-<script type="text/javascript">/*<![CDATA[*/
- if (typeof orb !== 'undefined' && typeof orb.fig === 'function') {
- bbcdotcom.data = {
- a: orb.fig('ad')? 1 : 0,
- b: (0 == orb.fig('uk')) ? 1 : 0,
- c: orb.fig('ap')
- };
- } else {
- document.write(unescape('%3Cscript type="text/javascript"
src="http://tps.bbc.com/wwscripts/data"%3E%3C/script%3E'));
- }
-/*]]>*/</script>
-<script type="text/javascript">/*<![CDATA[*/
- if (typeof bbcdotcom.data == 'undefined' || typeof bbcdotcom.data.a ==
'undefined' || typeof bbcdotcom.data.b == 'undefined' || typeof
bbcdotcom.data.c == 'undefined') {
- bbcdotcom.data = {a:0,b:0,c:0};
- }
- if (bbcdotcom.data.a == 1) {
- document.write(unescape('%3Clink
href="http://news.bbcimg.co.uk/css/screen/shared/0.3.236/3pt_ads.css"
rel="stylesheet" type="text/css" /%3E'));
-
- document.write(unescape('%3Cscript type="text/javascript"
src="http://www.bbc.co.uk/wwscripts/flag"%3E%3C/script%3E'));
-
- }
-/*]]>*/</script>
-<script type="text/javascript">/*<![CDATA[*/
- if (typeof bbcdotcom.flag == 'undefined' || bbcdotcom.flag.a != 1) {
- bbcdotcom.data.a = 0;
- }
- if (bbcdotcom.data.a == 1 || bbcdotcom.data.b == 1) {
- document.write(unescape('%3Cscript type="text/javascript"
src="http://news.bbcimg.co.uk/js/app/bbccom/0.3.236/bbccom.js"%3E%3C/script%3E'));
- }
-/*]]>*/</script>
-<script type="text/javascript">/*<![CDATA[*/
- if (bbcdotcom.data.a == 1 || bbcdotcom.data.b == 1) {
- BBC.adverts.setData(bbcdotcom.data);
- bbcdotcom.config.setAdsEnabled(bbcdotcom.data.a);
- bbcdotcom.config.setAnalyticsEnabled(bbcdotcom.data.b);
- if(typeof bbcdotcom !== 'undefined' && typeof bbcdotcom.survey !==
'undefined' && typeof bbcdotcom.survey.init === 'function') {
- bbcdotcom.survey.init();
- }
- }
- bbcdotcom.objects('page', 'create', bbcdotcom);
- bbcdotcom.page.edition = '(none)';
- bbcdotcom.page.url = '/news/scotland/';
- bbcdotcom.page.zoneFile = '3pt_zone_file';
- bbcdotcom.page.http_host = 'www.bbc.co.uk';
-
-
-/*]]>*/</script>
-<script type="text/javascript">/*<![CDATA[*/if(bbcdotcom.data.a ==
1){(function(){switch(bbcdotcom.page.url){case"/":case"/default.stm":bbcdotcom.page.url=(bbcdotcom.page.edition==="domestic")?"/1/hi/default.stm":"/2/hi/default.stm";break;case"/sport":case"/sport/":case"/sport/default.stm":bbcdotcom.page.url=(bbcdotcom.page.edition==="domestic")?"/sport1/hi/default.stm":"/sport2/hi/default.stm";break}BBC.adverts.setScriptRoot("http://news.bbcimg.co.uk/js/app/bbccom/0.3.236/");bbcdotcom.c
[...]
-<script type="text/javascript">
- /*<![CDATA[*/
- if (BBC.adverts.isActive('analytics')) {
- document.write(unescape('%3Cscript id="gnlAnalyticsEnabled"
class="bbccom_display_none"%3E%3C/script%3E'));
- }
- /*]]>*/
-</script>
-
-
-
-
-
-<script type="text/javascript">
- if(typeof BBC.adverts != 'undefined' && typeof
BBC.adverts.setPageVersion != 'undefined'){
- BBC.adverts.setPageVersion('(none)');
- }
-</script>
-
-
-
-
- <!-- hi/news/head_last.inc -->
-
-<script type="text/javascript">
-
-function BetaSite() {
- function setMobileCookie() {
- var d = new Date ();
- d.setDate(d.getDate() + 1);
- d = d.toUTCString();
-
- window.bbccookies.set('ckps_d=m;domain=.bbc.co.uk;path=/;expires=' + d );
- window.bbccookies.set('ckps_d=m;domain=.bbc.com;path=/;expires=' + d );
- }
-
- function isValidQueryString() {
- return (window.location.search.indexOf('view=beta') !== -1);
- }
-
- function isClientCapable() {
- return ('querySelector' in document && 'localStorage' in window &&
'addEventListener' in window);
- }
-
- if (isClientCapable() && isValidQueryString()) {
- setMobileCookie();
-
- window.location.host = 'm.bbc.co.uk';
- }
-}
-
-BetaSite();
-
-</script>
-
-
-<link rel="stylesheet" type="text/css" media="screen"
href="BBC_News_Scotland_files/skin.css">
-
-
-<link rel="apple-touch-icon"
href="http://news.bbcimg.co.uk/img/1_0_3/cream/hi/news/iphone.png">
-<script type="text/javascript">
- bbcRequireMap['module/weather'] =
'/inc/specials/cream/hi/news/personalisation/weather';
- bbcRequireMap['module/local'] =
'/inc/specials/cream/hi/news/personalisation';
- bbcRequireMap['module/localnewsandweather'] =
'/inc/specials/cream/hi/news/personalisation/localnewsandweather';
- bbcRequireMap['translation'] = 'module/translations/en-GB';
- require({ baseUrl: 'http://static.bbci.co.uk/', paths: bbcRequireMap,
waitSeconds: 30 });
-</script>
-<script type="text/javascript">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (function(){
- var path_prefix = "http://www.live.bbc.co.uk/nfp";
-
- define('config', function () {
- return {
- "pathPrefix": path_prefix.replace('.live', ''),
- "service": 'nfp',
- "local": {
- "simple": true,
- "story_limit": 6,
- "weather_type": "daily",
- "append_ext": ".inc",
- "allowAutoComplete": true,
- "allowLocationLookup": false
- }
- };
- });
- }());
-
-
-
-require(['jquery-1'], function(jQuery) {
- jQuery.ajaxSetup({cache: true})
-});
-
-require(["jquery-1", "istats-1"], function ($, istats) {
- $(function() {
- istats.track('external', {region: $('.story-body'), linkLocation :
'story-body'});
- istats.track('external', {region: $('.story-related .related-links'),
linkLocation : 'related-links'});
- istats.track('external', {region: $('.story-related
.newstracker-list'), linkLocation : 'newstracker'});
- });
-});
-
-</script>
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- CPS COMMENT STATUS: false -->
-
-
-
-
-
-
- <!--Rendered by NOLAPPS203-6001 -->
- <link rel="schema.dcterms" href="http://purl.org/dc/terms/">
- <meta name="DCTERMS.created" content="2010-07-05T16:02:59+00:00">
- <meta name="DCTERMS.modified" content="2014-03-31T13:53:03+00:00">
- <script src="BBC_News_Scotland_files/istats-1.js"
data-requiremodule="istats-1" data-requirecontext="_" async="" charset="utf-8"
type="text/javascript"></script><script
src="BBC_News_Scotland_files/idcta-1.js" data-requiremodule="idcta/idcta-1"
data-requirecontext="_" async="" charset="utf-8"
type="text/javascript"></script><script
src="BBC_News_Scotland_files/gelui-1.js" data-requiremodule="gelui-1"
data-requirecontext="_" async="" charset="utf-8"
type="text/javascript"></script><sc [...]
-
- <!--[if lte IE 6]><body class="news ie
disable-wide-advert"><![endif]-->
- <!--[if IE 7]><body class="news ie7 disable-wide-advert"><![endif]-->
- <!--[if IE 8]><body class="news ie8 disable-wide-advert"><![endif]-->
- <!--[if !IE]>--><body class="news disable-wide-advert
glow177-gecko"><!--<![endif]-->
-
-
-
-<div class="livestats-web-bug" id="livestats-web-bug-tag"><img alt=""
id="livestats" src="BBC_News_Scotland_files/o.gif"></div>
-
-<script type="text/JavaScript">
- var referrer = document.referrer;
-
- var livestatsBug = "<img alt='' id='livestats'
src='http://stats.bbc.co.uk/o.gif?~RS~s~RS~News~RS~t~RS~HighWeb_Index~RS~i~RS~0~RS~p~RS~99112~RS~a~RS~Domestic~RS~u~RS~/news/scotland/~RS~r~RS~"+referrer+"~RS~q~RS~~RS~z~RS~36~RS~'>";
-
-
- document.getElementById('livestats-web-bug-tag').innerHTML =
livestatsBug;
-</script>
-
-
-<noscript>
-<div class="livestats-web-bug"><img alt="" id="livestats"
src="http://stats.bbc.co.uk/o.gif?~RS~s~RS~News~RS~t~RS~HighWeb_Index~RS~i~RS~0~RS~p~RS~99112~RS~a~RS~Domestic~RS~u~RS~/news/scotland/~RS~q~RS~~RS~z~RS~36~RS~"/></div>
-</noscript>
-
-
- <!-- BBCDOTCOM body first include -->
-
-
-<script type="text/javascript">BBC.adverts.write("wallpaper",false);</script>
-<script
type="text/javascript">/*<![CDATA[*/BBC.adverts.wallpaperBodyTag=document.getElementsByTagName("body");BBC.adverts.wallpaperATag=document.getElementsByTagName("a");if("undefined"!=typeof
BBC.adverts.wallpaperATag&&"undefined"!=typeof
BBC.adverts.wallpaperATag[0]&&"undefined"!=typeof
BBC.adverts.wallpaperBodyTag&&"undefined"!=typeof
BBC.adverts.wallpaperBodyTag[0]&&-1!==BBC.adverts.wallpaperATag[0].href.indexOf("http://ad.doubleclick.net")){BBC.adverts.wallpaperBodyTag[0].removeCh
[...]
-
-
-
-
-
- <!-- ISTATS -->
-
-
-
-
-
-
-
-
-
-
- <script type="text/javascript">/*<![CDATA[*/ bbcFlagpoles_istats = 'ON';
istatsTrackingUrl =
'//sa.bbc.co.uk/bbc/bbc/s?name=news.scotland.page&cps_asset_id=10059375&page_type=index§ion=scotland&app_version=6.2.180-RC3&first_pub=2010-07-05T16:02:59+00:00&last_editorial_update=2014-03-31T13:53:03+00:00&title=&comments_box=false&cps_media_type=&cps_media_state=&by_nation=&app_type=web&ml_name=SSI&ml_version=0.17.2&language=en-GB';
if (window.istats_countername) { istatsTrackingUrl = is [...]
-
-
-
- <div class="scotland has-no-ticker main-content-container">
- <div id="header-wrapper">
-
-
- <h1
id="header">
- <a rel="index"
href="http://www.bbc.co.uk/news/"><img alt="BBC News"
src="BBC_News_Scotland_files/news-blocks.gif"></a>
-
<span class="section-title">Scotland</span>
-
</h1>
-
-
- <div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-sponsor-section");</script>
- </div>
- <script
type="text/javascript">$render("advert-post-script-load");</script>
-
- <a
href="http://feeds.bbci.co.uk/news/scotland/rss.xml" id="rss-alternative">
- RSS<span class="gvl3-icon gvl3-icon-rss">
feed</span>
- </a>
-
-
- <div id="blq-local-nav">
- <ul id="nav" class="nav">
-
-
- <li class="first-child "><a
href="http://www.bbc.co.uk/news/">Home</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/world/">World</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/uk/">UK</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/england/">England</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/northern_ireland/">N. Ireland</a></li>
-
-
- <li class="selected"><a
href="http://www.bbc.co.uk/news/scotland/">Scotland</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/wales/">Wales</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/business/">Business</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/politics/">Politics</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/health/">Health</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/education/">Education</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/science_and_environment/">Sci/Environment</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/technology/">Technology</a></li>
-
-
- <li><a
href="http://www.bbc.co.uk/news/entertainment_and_arts/">Entertainment &
Arts</a></li>
- </ul>
-
- <ul id="sub-nav" class="nav">
-
- <li class="first-child "><a
href="http://www.bbc.co.uk/news/scotland/scotland_politics/">Scotland
Politics</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/scotland_business/">Scotland
Business</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/edinburgh_east_and_fife/">Edinburgh,
Fife & East</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/glasgow_and_west/">Glasgow &
West</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/highlands_and_islands/">Highlands
& Islands</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/north_east_orkney_and_shetland/">NE,
Orkney & Shetland</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/south_scotland/">South</a></li>
-
- <li><a
href="http://www.bbc.co.uk/news/scotland/tayside_and_central/">Tayside &
Central</a></li>
- </ul>
- </div>
-
-
- </div>
- <!-- START CPS_SITE CLASS: domestic -->
- <div id="content-wrapper" class="domestic">
-
- <div class="advert">
-
- <div
class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-leaderboard");</script>
- </div>
- <script
type="text/javascript">$render("advert-post-script-load");</script>
-
-
</div>
- <div id="bbccom_custom_branding">
- <script type="text/javascript">
- /*<![CDATA[*/
- if(typeof bbcdotcom.objects('bbcdotcom.branding.init') === 'function')
{
- bbcdotcom.branding.init(BBC.adverts.getZoneData().zone,
BBC.adverts.getAdKeyword());
- bbcdotcom.branding.write();
- }
- /*]]>*/
- </script>
- <div class="bbccom_advert_placeholder">
- <script type="text/javascript">
- /*<![CDATA[*/
- $render("advert","advert-sponsor-subsection");
- /*]]>*/
- </script>
-</div>
-</div>
-<script type="text/javascript">
- /*<![CDATA[*/
- $render("advert-post-script-load");
- /*]]>*/
-</script>
-
- <!-- START CPS_SITE CLASS: index -->
- <div id="main-content" class="index blq-clearfix">
- <!-- No EWA -->
-
-
-
-
-<div id="full-width" class="container-full-width">
- <div class="index-date">
- <span class="date">31 March 2014</span>
-<span class="time-text">Last updated at </span><span class="time">14:53</span>
-
-</div>
-
- <div id="full-width-include" class="include-only
special-event-promotion-full-width">
-
-</div>
-<script
type="text/javascript">$render("full-width-include","full-width-include");</script>
-</div>
-<script
type="text/javascript">$render("container-full-width","full-width");</script>
-
-<div id="now" class="container-now">
-
-<div id="container-top-stories-with-splash" class="container-top-stories">
-
-
-
-
-
-
- <div id="top-story" class="large-image">
-
- <h2 class="top-story-header ">
- <a class="story" rel="published-1396263959196"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26818852">
- Australian firm to create 110 jobs<img
src="BBC_News_Scotland_files/_73924044_73921422.jpg" alt="Clough graphic"></a>
- </h2>
-
- <p>An Australian firm which services the energy, chemical and
-mining sectors is to open a base in Scotland, creating 110 new jobs.
-
- <span id="dna-comment-count___CPS__26818852" class="gvl3-icon
gvl3-icon-comment comment-count"></span></p>
- <hr>
- </div>
- <script type="text/javascript">$render("top-story","top-story");</script>
-
-
-
-
-
-
-
-
- <div id="second-story" class="secondary-top-story">
-
- <div class="large-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2 class=" secondary-story-header">
- <a class="story" rel="published-1396257853848"
href="http://www.bbc.co.uk/sport/0/football/26817253"><img
src="BBC_News_Scotland_files/_73921211_9789351.jpg" alt="Hearts won Sunday's
Edinburgh derby 2-0">Hearts in fight to stay afloat</a>
-
- </h2>
-
-
- <p>Hearts face the prospect of running out of money by the end
-of April if a deal to take the club out of administration is not agreed
-soon. <a class="from-external-source"
href="http://www.bbc.co.uk/sport/0/">BBC Sport</a>
-
- <span id="dna-comment-count___CPS__26817253" class="gvl3-icon
gvl3-icon-comment comment-count"></span></p>
-
- </div>
- </div>
- <script
type="text/javascript">$render("secondary-top-story","second-story");</script>
-
-
-
-
-
-
-
-
-
-
- <div id="third-story" class="secondary-top-story">
-
- <div class="large-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2 class=" secondary-story-header">
- <a class="story" rel="published-1396224468575"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26809706"><img
src="BBC_News_Scotland_files/_73909989_sthelena.jpg" alt="Primary school pupil
with the Queen's baton in St Helena">Email error on Queen's Baton bearers</a>
-
- </h2>
-
-
- <p>Blank emails are sent to some people waiting to find out
-whether they have been chosen to carry the Queen's Baton before the
-Commonwealth Games.
- <span id="dna-comment-count___CPS__26809706" class="gvl3-icon
gvl3-icon-comment comment-count"></span></p>
-
- <ul class="see-also">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class=" first-child column-1">
- <a class="story" rel="published-1362999629235"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-21715076">Glasgow
2014: Queen's Baton Relay route</a>
-
-
- </li>
-
- </ul>
- </div>
- </div>
- <script
type="text/javascript">$render("secondary-top-story","third-story");</script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="other-top-stories" class="other-top-stories">
-
- <ul class="other-top-stories-stories">
-
-
-
-
-
- <li class="column-1 with-summary first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396270342949"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26822671">Appeal over
missing sex offender</a>
-
- </h2>
-
-
-
<p>Police appeal for help in tracing a registered sex offender in
Glasgow after he failed to turn up at court.
- <span
id="dna-comment-count___CPS__26822671" class="gvl3-icon gvl3-icon-comment
comment-count"></span></p>
- </li>
-
-
-
-
- <li class="column-1 with-summary ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396254065307"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26817350">Tributes
to mother killed in crash</a>
-
- </h2>
-
-
-
<p>Tribute is paid by relatives to a "wonderful" 28-year-old mother who
was killed in a crash on the A96 in Moray.
- <span
id="dna-comment-count___CPS__26817350" class="gvl3-icon gvl3-icon-comment
comment-count"></span></p>
- </li>
-
-
-
-
- <li class="column-1 with-summary ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396223037169"
href="http://www.bbc.co.uk/news/uk-scotland-26809698">RSPB in climate change
action call</a>
-
- </h2>
-
-
-
<p>RSPB Scotland calls for more action on climate change
-after a report suggests it is having a big impact on some species and
-habitats.
- <span
id="dna-comment-count___CPS__26809698" class="gvl3-icon gvl3-icon-comment
comment-count"></span></p>
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396223286998"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-business-26784889">Construction
bosses 'more confident'</a>
-
- <span id="dna-comment-count___CPS__26784889" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396258447212"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26818850">Woman dies
after Bearsden road crash</a>
-
- <span id="dna-comment-count___CPS__26818850" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396266982108"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26817356">Former
So Solid Crew member fined</a>
-
- <span id="dna-comment-count___CPS__26817356" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396268477121"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26821234">Skiing
until end of April 'possible'</a>
-
- <span id="dna-comment-count___CPS__26821234" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396262674922"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26819151">Festival to
pay tribute to Iain Banks</a>
-
- <span id="dna-comment-count___CPS__26819151" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396223668919"
href="http://www.bbc.co.uk/news/uk-scotland-edinburgh-east-fife-26813170">Panda
mating preparations begin</a>
-
- <span id="dna-comment-count___CPS__26813170" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396270258777"
href="http://www.bbc.co.uk/news/business-26820844">Scottish farm incomes 'fell
by 34%'</a>
-
- <span id="dna-comment-count___CPS__26820844" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396265702158"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26817357">Asbo-style
notice for wind farm</a>
-
- <span id="dna-comment-count___CPS__26817357" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396255144943"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26817523">Armed
robbery at city betting shop</a>
-
- <span id="dna-comment-count___CPS__26817523" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h2>
- <a class="story" rel="published-1396265299461"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-26819160">Scottish
SPCA could get new powers</a>
-
- <span id="dna-comment-count___CPS__26819160" class="gvl3-icon
gvl3-icon-comment comment-count"></span>
- </h2>
-
-
- </li>
- </ul>
-</div>
-<script
type="text/javascript">$render("other-top-stories","other-top-stories");</script>
-
-</div>
-<script
type="text/javascript">$render("container-top-stories","container-top-stories-with-splash");</script>
-
-
- <div id="also-in-the-news" class="also-in-news">
- <h2 class="also-in-news-header">Also In
The News</h2>
-
- <ul>
-
-
-
-
-
- <li class="small-image
column-1 first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" rel="published-1396266463348"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26817726"><img
src="BBC_News_Scotland_files/_73924867_177533960.jpg" alt="TV studio">Glasgow
TV channel to launch in June</a>
-
-
- </h3>
-
- </li>
-
-
-
-
-
-
-
- <li class="small-image
column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" rel="published-1396261698130"
href="http://www.bbc.co.uk/news/uk-scotland-tayside-central-26819000"><img
src="BBC_News_Scotland_files/_73922520_00408cf54880_31-03-2014_07-22-54.jpg"
alt="Lady the osprey">'Oldest breeding osprey' returns</a>
-
-
- </h3>
-
- </li>
-
-
- </ul>
-
- </div>
- <script
type="text/javascript">$render("also-in-news","also-in-the-news");</script>
-
-
-
-
-
-
-
- <h2
class="geo-digest-solo-header">More news from around Scotland</h2>
-
- <div class="container-geographic-regions-generic ">
-
-
- <div id="geo-scotland-news-digest" class="geo-digest-region ">
-
-
-
-
-
-
-
-
-
-
-
-
- <div class="include-wrapper column-2">
- <div id="scotland-map"></div>
-</div>
-
-
-
-
-
-
-
-
-<div class="geo-digest-section column-1 ">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/edinburgh_east_and_fife/">Edinburgh,
Fife & East </a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396224652753"
href="http://www.bbc.co.uk/news/uk-scotland-edinburgh-east-fife-26786483">Altitude
sickness 'two illnesses'</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396257164391"
href="http://www.bbc.co.uk/news/uk-scotland-edinburgh-east-fife-26817846">Remains
confirmed as missing woman</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396188849503"
href="http://www.bbc.co.uk/news/uk-scotland-edinburgh-east-fife-26810876">Fatal
crash victim named by police</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
-
-
-
-
-
-<div class="geo-digest-section column-1 ">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/glasgow_and_west/">Glasgow &
West</a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396266681502"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26818856">Police name
man who died in crash</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396266748664"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26818853">Drug
trafficker to lose £214,000</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396223087266"
href="http://www.bbc.co.uk/news/magazine-26784218">Grant Morrison and Rian
Hughes: The story behind 'The Key'</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
-
-
-
-
-
-<div class="geo-digest-section column-1 ">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/highlands_and_islands/">Highlands
& Islands</a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396264053634"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26817532">Flybe
looks at Inverness-London link</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396168790221"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26808335">Climber
dies after Ben Nevis fall</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396062035656"
href="http://www.bbc.co.uk/news/magazine-26646648">Meet the aurora hunters</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
-
-
-
-
-
-<div class="geo-digest-section column-1 ">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/north_east_orkney_and_shetland/">North
East, Orkney & Shetland</a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396267930233"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-business-26820748">Ithaca
Energy profits rise to £87m</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396271583799"
href="http://www.bbc.co.uk/news/uk-scotland-tayside-central-26819725">New £2.5m
rig base for Dundee port</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396018957956"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26790169">Fans
'swear at own team' on Twitter</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
-
-
-
-
-
-<div class="geo-digest-section column-2 column-top">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/south_scotland/">South Scotland</a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396268083608"
href="http://www.bbc.co.uk/news/uk-scotland-south-scotland-26821780">Ice hockey
event nets revenue boost</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396224023029"
href="http://www.bbc.co.uk/news/uk-scotland-south-scotland-26787316">Bypass
cuts risk of 'bridge strikes'</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396224209908"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-business-26766606">Tyre
firm looks to fund expansion</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
-
-
-
-
-
-<div class="geo-digest-section column-2 ">
-
- <h4 class="geo-digest-section-header"><a class="story"
href="http://www.bbc.co.uk/news/scotland/tayside_and_central/">Tayside &
Central</a>
- </h4>
-
-
- <ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1396265993948"
href="http://www.bbc.co.uk/news/uk-scotland-tayside-central-26819717">Drunk
teen tried to ram police car</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1395819536244"
href="http://www.bbc.co.uk/news/uk-scotland-26744672">Scaling back the
many-headed Hydro</a>
-
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li>
- <a class="story" rel="published-1395401126525"
href="http://www.bbc.co.uk/news/uk-scotland-tayside-central-26681537">Escaped
police dog sparks search</a>
-
-
- </li>
-
- </ul>
-</div>
-
-
- </div>
- </div>
-
-
- <div id="correspondent-strapline" class="generic-include-container
correspondent-promotion-now">
- <h2 class="top-level-heading"><a
href="http://www.bbc.co.uk/news/correspondents/douglasfraser/">Our
Experts</a></h2>
-
- <div class="correspondent-promo">
- <div class="correspondent-promo-inner">
- <a href="http://www.bbc.co.uk/news/correspondents/briantaylor">
- <span class="correspondent-portrait"><img
src="BBC_News_Scotland_files/_58403028_97e82173-3495-4540-b671-f1464030139c.jpg"
alt="Brian Taylor, Political editor, Scotland" height="104" width="144"></span>
- <span class="promo-lead-in">Article written by Brian
Taylor</span>
- <span class="name">Brian Taylor</span>
- </a>
- <span class="bbc-role">Political editor, Scotland</span>
- <ul class="social-links">
- <li><a rel="me"
href="http://www.bbc.co.uk/news/correspondents/briantaylor">More from
Brian</a></li>
-
- </ul>
-
-
-
- <div class="correspondent-promo-item">
-
- <div class="article blog pinned">
- <h2><a
href="http://www.bbc.co.uk/news/uk-scotland-26800420">Contest of doubt and
reassurance </a></h2>
- <p class="article-date">11:47 UK time, Saturday, 29 March 2014</p>
- <p>Does it matter that an unnamed minister of unknown status
- follows an undiscernible motivation and gives an off-the-record comment
- to The Guardian? Frankly, yes it does. </p>
- <p>
- <a href="http://www.bbc.co.uk/news/uk-scotland-26800420">
- Read full article
</a>
- </p>
- </div>
-
-
- </div>
-
-
-
-
- </div>
-</div>
-
- <div class="correspondent-promo">
- <div class="correspondent-promo-inner">
- <a
href="http://www.bbc.co.uk/news/correspondents/douglasfraser">
- <span class="correspondent-portrait"><img
src="BBC_News_Scotland_files/_58405014_4290d1a0-7725-4113-a5e1-a14e4c5885c3.jpg"
alt="Douglas Fraser, Business and economy editor, Scotland" height="104"
width="144"></span>
- <span class="promo-lead-in">Article written by Douglas
Fraser</span>
- <span class="name">Douglas Fraser</span>
- </a>
- <span class="bbc-role">Business and economy editor,
Scotland</span>
- <ul class="social-links">
- <li><a rel="me"
href="http://www.bbc.co.uk/news/correspondents/douglasfraser">More from
Douglas</a></li>
-
- </ul>
-
-
-
- <div class="correspondent-promo-item">
-
- <div class="article blog pinned">
- <h2><a href="http://www.bbc.co.uk/news/uk-scotland-26815714">Has
Scotland ‘de-globalised’? </a></h2>
- <p class="article-date">8 hours ago</p>
- <p>As Scotland looks to a choice on its future, two academic
- contributions give us a new take on the economic route that got us to
-where we are now.</p>
- <p>
- <a href="http://www.bbc.co.uk/news/uk-scotland-26815714">
- Read full article
</a>
- </p>
- </div>
-
-
- </div>
-
-
-
-
- </div>
-</div>
-
- </div>
-<script
type="text/javascript">$render("correspondent-strapline","correspondent-strapline");</script>
-
-<div id="special-reports" class="special-reports-component">
-
- <h2 class="special-reports-header">
- <a href="http://www.bbc.co.uk/news/16630456">Special Reports</a>
- </h2>
-
-
- <div class="special-reports-wrapper">
-
-
-
-
- <div class="top-report">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" rel="published-1358350237871"
href="http://www.bbc.co.uk/news/16630456"><img
src="BBC_News_Scotland_files/_69185589_flags4.jpg" alt="Saltire and union
flags">Scotland's Future</a>
-
- </h3>
-
- <p>Latest news, background and analysis on the
referendum on Scottish independence</p>
-
-
- <div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-sponsor-module","special-reports","scotlands-future");</script>
- </div>
- <script
type="text/javascript">$render("advert-post-script-load");</script>
-
- </div>
-
- <div
class="more-special-reports">
- <h3 class="more">More Special Reports:</h3>
- <ul>
- <li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4>
- <a class="story" rel="published-1381312793289"
href="http://www.bbc.co.uk/news/world-24733934">Queen's Baton Relay</a>
-
- </h4>
-
- </li>
-
- </ul>
- </div>
- </div>
-
-</div>
-<script
type="text/javascript">$render("special-reports","special-reports");</script>
-
-
-
-<div id="category-digests" class="container-category-digests digest-multiple">
-
- <h2 class="digest-wrapper-header">More from
Scotland</h2>
-
-
-
-
-
-
-
-
-<div class="digest first-child">
-
- <h3 class="digest-header"><a
href="http://www.bbc.co.uk/news/scotland/scotland_politics/">Politics</a></h3>
-
- <ul>
-
-
-
- <li class="medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396155748874"
href="http://www.bbc.co.uk/news/uk-scotland-26807255"><img
src="BBC_News_Scotland_files/_73910280_carmichael_pa.jpg" alt="Alistair
Carmichael">Scottish Yes vote 'not impossible'</a>
-
- </h4>
-
-
-
<p>It is "absolutely the case" that the Yes campaign could
-win the independence referendum, Scottish Secretary Alistair Carmichael
-warns.</p>
-
<hr>
- </li>
-
-
-
-
-
- <li class="column-1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396053207489"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-26791759">Rennie
critical of justice overhaul</a>
-
- </h4>
-
- </li>
-
-
-
-
- <li class="column-2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396137694358"
href="http://www.bbc.co.uk/news/uk-scotland-26803331">Dentists to be given
defibrillators</a>
-
- </h4>
-
- </li>
- </ul>
-</div>
-
-
-
-
-
-
-
-
-<div class="digest ">
-
- <h3 class="digest-header"><a
href="http://www.bbc.co.uk/news/scotland/scotland_business/">Business</a></h3>
-
- <ul>
-
-
-
- <li class="medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396223830934"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-business-26810879"><img
src="BBC_News_Scotland_files/_73913572_176640491.jpg" alt="Office desk">Small
firms split over independence</a>
-
- </h4>
-
-
-
<p>Scotland's small business owners are divided over the possible
implications of independence, a survey has suggested.</p>
-
<hr>
- </li>
-
-
-
-
-
- <li class="column-1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396243904074"
href="http://www.bbc.co.uk/news/uk-scotland-26812504">Experts discuss young
workforce plan</a>
-
- </h4>
-
- </li>
-
-
-
-
- <li class="column-2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396042706378"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-26791763">Osborne
denies currency deal claim</a>
-
- </h4>
-
- </li>
- </ul>
-</div>
-
-
-
-
-
-
-
-
-<div class="digest ">
-
- <h3 class="digest-header"><a
href="http://www.bbc.co.uk/sport1/hi/scotland/default.stm">Sport</a></h3>
-
- <ul>
-
-
-
- <li class="medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396266373324"
href="http://www.bbc.co.uk/sport/0/football/26821335"><img
src="BBC_News_Scotland_files/_73925590_6101831.jpg" alt="Craig Gordon last
played for Scotland in November 2010">Gordon eyes return for Scotland</a>
-
- </h4>
-
-
-
<p>Scotland goalkeeper Craig Gordon is looking forward to reviving his
career after two years on the sidelines through injury.</p>
-
<hr>
- </li>
-
-
-
-
-
- <li class="column-1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396248538845"
href="http://www.bbc.co.uk/sport/0/golf/26800602">Masters dream debut for
Gallacher</a>
-
- </h4>
-
- </li>
-
-
-
-
- <li class="column-2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396261211982"
href="http://www.bbc.co.uk/sport/0/football/26819868">Bolton extend Hutton loan
deal</a>
-
- </h4>
-
- </li>
- </ul>
-</div>
-
-
-
-
-
-
-
-
-<div class="digest ">
-
- <h3 class="digest-header"><a
href="http://www.bbc.co.uk/naidheachdan/">Naidheachdan</a></h3>
-
- <ul>
-
-
-
- <li class="medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396259651220"
href="http://www.bbc.co.uk/naidheachdan/26785718"><img
src="BBC_News_Scotland_files/_73921983_bookies.jpg" alt="CÃ r poilis ann an
Inbhir Nis">Mèirle le gunna an Inbhir Nis ga rannsachadh</a>
-
- </h4>
-
-
-
<p>Poilis ann an Inbhir Nis a' sireadh fear a rinn mèirle le gunna ann
am bùth gheall sa bhaile.</p>
-
<hr>
- </li>
-
-
-
-
-
- <li class="column-1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396255651694"
href="http://www.bbc.co.uk/naidheachdan/26817704">Fireannach air bà sachadh air
Beinn Nibheis</a>
-
- </h4>
-
- </li>
-
-
-
-
- <li class="column-2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h4 class=" digest-story-header">
- <a class="story" rel="published-1396002222272"
href="http://www.bbc.co.uk/naidheachdan/26783316">Obair gus tòiseachadh air
camarathan an A9</a>
-
- </h4>
-
- </li>
- </ul>
-</div>
-
- </div>
-<script
type="text/javascript">$render("container-generic-digests","category-digests");</script>
-
-
-<div id="featured-other-site" class="container-featured-other-site">
- <h2 class="container-featured-other-site-heading"><a
href="http://www.bbc.co.uk/democracylive/scotland/">Democracy Live</a></h2>
-
-<div id="featured-site-top-stories" class="featured-site-top-stories">
-
-
- <ul>
-
-
-
-
- <li class=" medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" rel="published-1395926962010"
href="http://www.bbc.co.uk/democracylive/scotland-26759524"><img
src="BBC_News_Scotland_files/_73851791_73849714.jpg" alt="First Minister Alex
Salmond">Scottish Parliament<span class="gvl3-icon-wrapper"><span
class="gvl3-icon gvl3-icon-invert-watch"> Watch</span></span></a>
-
- </h3>
-
-
- <p>Alex Salmond welcomes the
'big six' energy firms having to face a competition inquiry.</p>
-
-
-
-
- <hr>
- </li>
-
- </ul>
-</div>
-<script
type="text/javascript">$render("featured-site-top-stories","featured-site-top-stories");</script>
-
- <div id="featured-site-include-2" class="include-only
featured-site-include">
- <div id="find-a-representative" class="find-a-representative">
-
-<div class="content-object-34">
- <h2>Find a representative</h2>
- <div class="content-container">
- <form id="content-object-34-form" method="get"
action="http://news.bbc.co.uk/democracylive/hi/representatives/search">
- <fieldset class="content-object-34-fieldset">
- <legend><span>Search terms</span></legend>
- <label class=""
for="content-object-34-form-keyword">Enter the name of who you are looking for,
a place or full postcode e.g. CF10 3NQ</label>
- <input id="content-object-34-form-keyword" name="q"
class="input" type="text">
- <input id="search-type" name="type"
value="representatives" type="hidden">
- <input value="Search" class="submit"
id="content-object-34-form-submit" type="submit">
- </fieldset>
- </form>
- </div>
- </div>
-
-</div>
-<script type="text/javascript">
-$render("hide-text-input-labels","find-a-representative");
-gloader.load(["glow","1","glow.forms"],{onLoad: function(glow){new
glow.forms.Form("#content-object-34-form").addTests("q", ["required"]);}});
-</script>
-</div>
-<script
type="text/javascript">$render("featured-site-include-2","featured-site-include-2");</script>
-</div>
-<script
type="text/javascript">$render("container-featured-other-site","featured-other-site");</script>
-
-
-
-<div id="useful-links" class="useful-links ">
- <h2 class="useful-links-header"><a
href="http://www.bbc.co.uk/scotland/">From BBC Scotland</a></h2>
- <ul>
-
-
-
-
- <li class="column-1 first-child column-top">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/radioscotland/">Radio
Scotland</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-1 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/alba/">BBC Alba</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-1 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/radionangaidheal/">Radio
nan GÃ idheal</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-1 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story"
href="http://www.bbc.co.uk/scotland/learning/">Learning Scotland</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-2 column-top">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/alba/ceol/">Ceòl/Music</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/scotland/music/">Scotland's
Music</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story"
href="http://www.bbc.co.uk/scotland/landscapes/">Scotland's Landscape</a>
-
- </h3>
-
- </li>
-
-
-
-
-
- <li class="column-2 ">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" href="http://www.bbc.co.uk/robertburns/">Robert
Burns</a>
-
- </h3>
-
- </li>
-
- </ul>
-</div>
-
-
-</div>
-<script type="text/javascript">$render("container-now","now");</script>
-
-<div id="best" class="container-best">
-
-<div id="promo-best" class="container-promo-best">
-
-<div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-mpu-high");</script>
-</div>
-<script type="text/javascript">$render("advert-post-script-load");</script>
-
-
-<div id="av-best" class="container-av-best">
-
-
- <div id="av-stories-best" class="av-stories-best">
-
- <h2
class="av-best-header">Watch/Listen</h2>
-
- <div class="list-wrapper">
-
-
- <div class="glow177-carousel gvl3-carousel"><div
class="carousel-light"><div style="width: 288px; height: 124px;"
class="carousel-window paged"><ul style="width: 1152px;"
class="av-best-carousel carousel carousel-content">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li style="" class=" first-child carousel-item ">
- <a class="story" rel="published-1396116943248"
href="http://www.bbc.co.uk/news/uk-scotland-26803761"><img
src="BBC_News_Scotland_files/_73902066_reverend.jpg" alt="Reverend Dr Laurence
Whitley">Chaplain: 'Clutha heartache still raw'<span
class="gvl3-icon-wrapper"><span class="gvl3-icon gvl3-icon-invert-watch">
Watch</span></span><span class="av-time">01:56</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item ">
- <a class="story" rel="published-1396020103115"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-26787265"><img
src="BBC_News_Scotland_files/_73880347_alasdairgray.jpg" alt="Alasdair Gray,
author and artist">Gray on books, Yes vote and depression<span
class="gvl3-icon-wrapper"><span class="gvl3-icon gvl3-icon-invert-watch">
Watch</span></span><span class="av-time">09:37</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1396042051997"
href="http://www.bbc.co.uk/schoolreport/26794757"><img
src="BBC_News_Scotland_files/_73892326_01sr14weatherpackage.jpg" alt="BBC News
School Report took over the Nations and Regions weather bulletins">Student
forecasters present weather<span class="gvl3-icon-wrapper"><span
class="gvl3-icon gvl3-icon-invert-watch"> Watch</span></span><span
class="av-time">04:37</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1396017238947"
href="http://www.bbc.co.uk/news/uk-scotland-26784370"><img
src="BBC_News_Scotland_files/_73881486_cluha2.jpg" alt="clutha friends">Clutha
survivors talk about crash<span class="gvl3-icon-wrapper"><span
class="gvl3-icon gvl3-icon-invert-watch"> Watch</span></span><span
class="av-time">03:15</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1395908103544"
href="http://www.bbc.co.uk/news/business-26763495"><img
src="BBC_News_Scotland_files/_73841220_73827291.jpg" alt="graphic showing the
'big six'">'Energy firms need to rebuild trust'<span
class="gvl3-icon-wrapper"><span class="gvl3-icon gvl3-icon-invert-watch">
Watch</span></span><span class="av-time">02:10</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1395912403323"
href="http://www.bbc.co.uk/schoolreport/26566829"><img
src="BBC_News_Scotland_files/_73703503_de30.jpg" alt="Boy on badminton
court">Visiting Scotland's School of Sport<span class="gvl3-icon-wrapper"><span
class="gvl3-icon gvl3-icon-invert-watch"> Watch</span></span><span
class="av-time">04:10</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1395840700543"
href="http://www.bbc.co.uk/news/uk-26745169"><img
src="BBC_News_Scotland_files/_73824416_73818191.jpg" alt="Richard Durkin said
the ruling was a victory for the consumer">Laptop ruling 'victory for
consumer'<span class="gvl3-icon-wrapper"><span class="gvl3-icon
gvl3-icon-invert-watch"> Watch</span></span><span
class="av-time">01:54</span></a>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<li class="carousel-item not-visible">
- <a class="story" rel="published-1395792551250"
href="http://www.bbc.co.uk/news/magazine-26737284"><img
src="BBC_News_Scotland_files/_73806716_73806589.jpg" alt="Mountain hare (c)
Will Nicholls">Teen photographer's love for animals<span
class="gvl3-icon-wrapper"><span class="gvl3-icon gvl3-icon-invert-watch">
Watch</span></span><span class="av-time">03:19</span></a>
-
- </li>
-
-
</ul></div><ul style="margin-left: 96px;" class="pageNav"><li class="arrow
carousel-prev-disabled" id="leftarrow"><a href="#"
class="dotLabel">previous</a></li><li class="dot dot0 dotActive"><div
class="dotLabel">1</div></li><li class="dot dot1"><div
class="dotLabel">2</div></li><li class="dot dot2"><div
class="dotLabel">3</div></li><li class="dot dot3"><div
class="dotLabel">4</div></li><li class="arrow" id="rightarrow"><a href="#"
class="dotLabel">next</a></li></ul></div></div>
- </div>
-
- </div>
-
- <script
type="text/javascript">$render("av-stories-best","av-stories-best");</script>
-
-
-
-<div id="av-live-streams" class="av-live-streams">
-
-
-
- <ul>
-
-
- <li class=" first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class="has-icon-boxedlive ">
- <a class="story is-live" rel="published-1278944851948"
href="http://www.bbc.co.uk/news/10318089">BBC News Channel<span
class="gvl3-icon gvl3-icon-boxedlive"> Live</span></a>
-
- </h3>
-
- </li>
-
-
-
-
- <li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class="has-icon-boxedlive ">
- <a class="story is-live" rel="published-1279810521521"
href="http://news.bbc.co.uk/1/hi/help/7277283.stm" onclick="javascript: void
window.open('http://www.bbc.co.uk/iplayer/console/bbc_radio_scotland', 'BBC',
'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=512,height=270,left=0,top=0');
return false;">BBC Radio Scotland <span class="gvl3-icon gvl3-icon-boxedlive">
Live</span></a>
-
- </h3>
-
- </li>
- </ul>
- </div>
-<script
type="text/javascript">$render("av-live-streams","av-live-streams");</script>
-
-</div>
-<script
type="text/javascript">$render("container-av-best","av-best");</script>
-
-<div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-mpu-low");</script>
-</div>
-<script type="text/javascript">$render("advert-post-script-load");</script>
-
-</div>
-<script
type="text/javascript">$render("container-promo-best","promo-best");</script>
-
-<div id="features-and-analysis" class="container-features-and-analysis">
- <h2 class="features-header">Features & Analysis</h2>
-
- <ul>
-
-
-
-
-
-
- <!-- Non specific version -->
-
-
-
-
-
- <li class="first-child large-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396258295054"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26817526"><img
src="BBC_News_Scotland_files/_73920849_markmedcalf.jpg" alt="Otter">Natural
selection</a>
-
- </h3>
-
-
- <p>The winning entries
from the 2013 Scottish Nature Photography Awards
- <span id="dna-comment-count___CPS__26817526"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
- <!-- Non specific version -->
-
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396225120997"
href="http://www.bbc.co.uk/news/uk-scotland-tayside-central-26749122"><img
src="BBC_News_Scotland_files/_73832235_16_blue00035.jpg" alt="Dundee waterfront
image">Museum with a mission</a>
-
- </h3>
-
-
- <p>V&A Dundee aims
to change thinking about design
- <span id="dna-comment-count___CPS__26749122"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396259119589"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-26787241"><img
src="BBC_News_Scotland_files/_73921954_mcleishhands_pa.jpg" alt="Henry McLeish,
former Labour First Minister">Got a question?</a>
-
- </h3>
-
-
- <p>Former FM Henry
McLeish in the referendum webcast hot-seat
- <span id="dna-comment-count___CPS__26787241"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396223156644"
href="http://www.bbc.co.uk/news/magazine-26730067"><img
src="BBC_News_Scotland_files/_73929252_thekey-page5final.jpg" alt="A close up
of her face, some sort of realisation dawns upon her. She stares
open-mouthed.">The Key</a>
-
- </h3>
-
-
- <p>A novel in graphic
art form on the theme of freedom
- <span id="dna-comment-count___CPS__26730067"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396137699713"
href="http://www.bbc.co.uk/news/uk-scotland-highlands-islands-26764969"><img
src="BBC_News_Scotland_files/_73874302_postermontagefirst.jpg" alt="Belladrum
poster illustrations">Art attack </a>
-
- </h3>
-
-
- <p>How the idea for
Belladrum's 50ft woman grew
- <span id="dna-comment-count___CPS__26764969"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1396007990125"
href="http://www.bbc.co.uk/news/uk-scotland-26785779"><img
src="BBC_News_Scotland_files/_73906942_muckspreadingtorrofmoonzie.jpg"
alt="Tractor spreading muck">Your pictures</a>
-
- </h3>
-
-
- <p>A selection of your
pictures taken across Scotland
- <span id="dna-comment-count___CPS__26785779"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1393234575651"
href="http://www.bbc.co.uk/news/uk-scotland-26322003"><img
src="BBC_News_Scotland_files/_73918217_newspapers003.jpg" alt="Scotland's
newspapers">Scottish papers</a>
-
- </h3>
-
-
- <p>Newspaper review:
Scotland's front pages
- <span id="dna-comment-count___CPS__26322003"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1389203494700"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-25657131"><img
src="BBC_News_Scotland_files/_72161086_flags_seven.jpg" alt="Saltire and union
flag">Join in</a>
-
- </h3>
-
-
- <p>Apply to take part
in a TV referendum debate
- <span id="dna-comment-count___CPS__25657131"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
- <li class="medium-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1380190779983"
href="https://twitter.com/BBCScotlandNews"><img
src="BBC_News_Scotland_files/_70264710_tweetpromotoo.jpg" alt="Twitter">See our
tweets</a>
-
- </h3>
-
-
- <p>Follow the latest
BBC Scotland News updates on Twitter
- <span id="dna-comment-count___CPS__24282939"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- <hr>
- </li>
-
-
-
-
-
-
-
-
-
-
-
-
- <!-- Non specific version -->
-
-
-
- <li class="no-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1317896946303"
href="http://www.bbc.co.uk/news/uk-scotland-scotland-politics-15190428">Take
part</a>
-
- </h3>
-
-
- <p>Join Brian Taylor's
Big Debate audience
- <span id="dna-comment-count___CPS__15190428"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- </li>
-
-
- <li class="no-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1284383118762"
href="http://www.bbc.co.uk/news/uk-scotland-11287381">Send us your pictures</a>
-
- </h3>
-
-
- <p>How to send us your
images from across Scotland
- <span id="dna-comment-count___CPS__11287381"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- </li>
-
-
- <li class="no-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1327399992043"
href="http://www.bbc.co.uk/news/16630456">Scotland's future</a>
-
- </h3>
-
-
- <p>Latest news,
background and analysis on the 2014 referendum
- <span id="dna-comment-count___CPS__16698008"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- </li>
-
-
- <li class="no-image">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" feature-header">
- <a class="story" rel="published-1394451701516"
href="https://www.facebook.com/bbcscotlandnews">We're on Facebook</a>
-
- </h3>
-
-
- <p>Join us to get the
highlights from BBC Scotland news
- <span id="dna-comment-count___CPS__26516189"
class="gvl3-icon gvl3-icon-comment comment-count"></span></p>
-
- </li>
-
-
-
-
-
-
- </ul>
-</div>
-<script
type="text/javascript">$render("container-features-and-analysis","features-and-analysis");</script>
-
- <div id="special-event-promotion-best-promo-module-hyper"
class="include-only special-event-promotion-best">
-
-
-
-
-
- <!-- Empty hyperpuff -->
-
-</div>
-<script
type="text/javascript">$render("special-event-promotion-best-promo-module-hyper","special-event-promotion-best-promo-module-hyper");</script>
- <div id="special-event-promotion-best-1-include" class="include-only
special-event-promotion-best">
-
-
-
-
-
- <div class="hyperpuff">
- <div id="promotional-content"
class="hyper-promotional-content">
-
- <h2>Elsewhere on the BBC</h2>
-
- <ul>
-
-
-
-
<li class="medium-image first-child">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3>
- <a class="story" rel="published-1382701763924"
href="http://www.bbc.co.uk/news/world-24733934"><img
src="BBC_News_Scotland_files/_70711014_70706025.jpg" alt="Queen's Baton
Relay">Baton relay</a>
-
- </h3>
-
- <p>70
nations and territories, 288 days - Mark Beaumont travels the Commonwealth </p>
- </li>
- </ul>
-
- <div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-sponsor-module","hyper-promotional-content","baton-relay");</script>
- </div>
- <script
type="text/javascript">$render("advert-post-script-load");</script>
-
-</div>
-<script
type="text/javascript">$render("hyper-promotional-content","promotional-content");</script>
-
-
- </div>
-
-</div>
-<script
type="text/javascript">$render("special-event-promotion-best-1-include","special-event-promotion-best-1-include");</script>
-
-<div id="most-popular-promotion" class="container-most-popular-promotion">
-
-<div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-partner-button");</script>
-</div>
-<script type="text/javascript">$render("advert-post-script-load");</script>
-
-
-<div id="most-popular-category" class="livestats most-popular-category">
-
- <h2 class="livestats-header">Most Popular</h2>
- <h3 class="tab open">From Scotland in the last week</h3>
- <div id="livestats-week" class="panel">
- <ol>
- <li class="ol">
- <a class="story" href="http://www.bbc.co.uk/news/uk-scotland-26807255">
- <span class="livestats-icon livestats-sunday">Sunday: </span>Scottish Yes
vote 'not impossible'</a>
-</li><li class="ol">
- <a class="story"
href="http://www.bbc.co.uk/news/uk-scotland-glasgow-west-26787005">
- <span class="livestats-icon livestats-saturday">Saturday: </span>Clutha
victims remembered at service</a>
-</li><li class="ol">
- <a class="story"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26780189">
- <span class="livestats-icon livestats-friday">Friday: </span>'Dambusters'
squadron is disbanded</a>
-</li><li class="ol">
- <a class="story"
href="http://www.bbc.co.uk/news/uk-scotland-south-scotland-26756691">
- <span class="livestats-icon livestats-thursday">Thursday:
</span>'Asymmetric' school week approved</a>
-</li><li class="ol">
- <a class="story"
href="http://www.bbc.co.uk/news/uk-scotland-north-east-orkney-shetland-26731192">
- <span class="livestats-icon livestats-wednesday">Wednesday: </span>Man
wins 16-year laptop wrangle</a>
-</li>
- </ol>
- </div>
-
- <div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-sponsor-module","most-popular-category","most-popular");</script>
- </div>
- <script
type="text/javascript">$render("advert-post-script-load");</script>
-
-
-</div>
-
-<script
type="text/javascript">$render("most-popular-category","most-popular-category");</script>
-</div>
-<script
type="text/javascript">$render("container-most-popular-promotion","most-popular-promotion");</script>
- <div id="programmes-promotion" class="include-only
programmes-promotion">
-
-
-
-
-
- <div class="hyperpuff">
-
-
-
-
-<div id="container-programme-promotion" class="container-programme-promotion">
- <h2 class="programmes-header">Programmes</h2>
-
-
- <a class="iplayer-branding"
href="http://www.bbc.co.uk/iplayer/">BBC iPlayer</a>
-
-
- <ul
class="programmes-standard">
-
-
-
- <li class="medium-image first-item">
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h3 class=" programme-header">
- <a class="story" rel="published-1279103053874"
href="http://www.bbc.co.uk/programmes/b006mj3s"><img
src="BBC_News_Scotland_files/_48355416_b006mj3s_178_100.jpg" alt="Reporting
Scotland">Reporting Scotland<span class="gvl3-icon-wrapper"><span
class="gvl3-icon gvl3-icon-invert-watch"> Watch</span></span></a>
-
- </h3>
-
- <p>The latest news and weather from around Scotland.</p>
- <hr>
- </li>
-</ul>
-
- <div id="data-feed-best"
class="include-only data-feed-best">
- <ul><li class="medium-image"><h4 class="programme-header"><a
class="story"
href="http://www.bbc.co.uk/iplayer/episode/b03yr40c/Good_Morning_Scotland_31_03_2014/"><img
alt="Good Morning Scotland: 31/03/2014"
src="BBC_News_Scotland_files/b03yr40c_150_84.jpg">Good Morning Scotland<span
class="gvl3-icon-wrapper"><span class="gvl3-icon gvl3-icon-invert-listen">
Listen</span></span></a></h4><p>The nation's morning news programme with Gary
Robertson, Hayley Millar and Jim Naughtie.</p><hr> [...]
-</div>
-<script
type="text/javascript">$render("data-feed-best","data-feed-best");</script>
- </div>
-<script
type="text/javascript">$render("container-programmes-promotion","container-programme-promotion");</script>
-
- </div>
-
-</div>
-<script
type="text/javascript">$render("programmes-promotion","programmes-promotion");</script>
-
-<div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-mpu-bottom");</script>
-</div>
-<script type="text/javascript">$render("advert-post-script-load");</script>
-
-
-<div class="bbccom_advert_placeholder">
- <script
type="text/javascript">$render("advert","advert-google-adsense");</script>
-</div>
-<script type="text/javascript">$render("advert-post-script-load");</script>
-
-</div>
-<script type="text/javascript">$render("container-best","best");</script>
-
- <!-- END #MAIN-CONTENT & CPS_ASSET_TYPE CLASS: index -->
- </div>
-<!-- END CPS_AUDIENCE CLASS: domestic -->
-
-</div>
-<div id="related-services" class="footer">
- <div id="news-services">
- <h2>Services</h2>
- <ul>
- <li id="service-mobile" class="first-child"><a
href="http://www.bbc.co.uk/news/10628994"><span class="gvl3-mobile-icon-large
services-icon"> </span>Mobile</a></li>
- <li id="service-feeds"><a
href="http://www.bbc.co.uk/news/help-17655000"><span
class="gvl3-connected-tv-icon-large services-icon"> </span>Connected
TV</a></li>
- <li id="service-podcast"><a
href="http://www.bbc.co.uk/news/10628494"><span class="gvl3-feeds-icon-large
services-icon"> </span>News feeds</a></li>
- <li id="service-alerts"><a
href="http://www.bbc.co.uk/news/10628323"><span class="gvl3-alerts-icon-large
services-icon"> </span>Alerts</a></li>
- <li id="service-email-news"><a
href="http://www.bbc.co.uk/news/help/16617948"><span
class="gvl3-email-icon-large services-icon"> </span>E-mail news</a></li>
- </ul>
- </div>
- <div id="news-related-sites">
- <h2><a href="http://www.bbc.co.uk/news/19888761">About BBC News</a></h2>
- <ul>
- <li class="column-1"><a
href="http://www.bbc.co.uk/news/blogs/the_editors/">Editors' blog</a></li>
- <li class="column-1"><a href="http://www.bbc.co.uk/journalism/">BBC
College of Journalism</a></li>
- <li class="column-1"><a
href="http://www.bbc.co.uk/news/10621655">News sources</a></li>
- <li class="column-1"><a
href="http://www.bbc.co.uk/editorialguidelines/">Editorial Guidelines</a></li>
- </ul>
- </div>
-</div>
-</div><!-- close scotland -->
-
-
-
-
-
-
- </div> <!--[if IE 6]> <div id="blq-ie6-upgrade"> <p> <span>You're using
the Internet Explorer 6 browser to view the BBC website. Our site will work
much better if you change to a more modern browser. It's free, quick and
easy.</span> <a href="http://www.browserchoice.eu/">Find out more <span>about
upgrading your browser</span> here…</a> </p> </div> <![endif]--> <div
role="contentinfo" id="blq-foot" xml:lang="en-GB" class="blq-rst blq-clearfix
blq-foot-transparent blq-foot-te [...]
- page is best viewed in an up-to-date web browser with style sheets
-(CSS) enabled. While you will be able to view the content of this page
-in your current browser, you will not be able to get the full visual
-experience. Please consider upgrading your browser software or enabling
-style sheets (CSS) if you are able to do so.</strong></p></div> </div> </div>
</div> </div> <script type="text/javascript"> if (typeof require !==
'undefined') { require(['istats-1'], function(istats){ istats.track('external',
{ region: document.getElementById('blq-main') }); istats.track('download', {
region: document.getElementById('blq-main') }); }); } </script> <script
type="text/html" id="blq-panel-template-promo"><![CDATA[ <div
id="blq-panel-promo" class="blq-masthead-container" [...]
-
-
-<!-- shared/foot -->
-<script type="text/javascript">
- bbc.fmtj.common.removeNoScript({});
- bbc.fmtj.common.tabs.createTabs({});
-</script>
-<!-- hi/news/foot.inc -->
-
-<!-- Chartbeat Web Analytics code - start -->
-<script type="text/javascript">
-var _sf_async_config={};
-/** CONFIGURATION START **/
-_sf_async_config.uid = 50924; /** Chartbeat BBC id **/
-_sf_async_config.domain = "bbc.co.uk";/** BBC domain being tracked **/
-_sf_async_config.sections = "scotland";
-_sf_async_config.region = "domestic";
-
-
-
-/** CONFIGURATION END **/
-(function(){
- function loadChartbeat() {
- window._sf_endpt=(new Date()).getTime();
- var e = document.createElement("script");
- e.setAttribute("language", "javascript");
- e.setAttribute("type", "text/javascript");
- e.setAttribute('src',
'/inc/specials/cream/hi/news/chartbeat/chartbeat.js');
- document.body.appendChild(e);
- }
- var oldonload = window.onload;
- window.onload = (typeof window.onload != "function") ?
- loadChartbeat : function() { oldonload(); loadChartbeat(); };
-})();
-</script>
-<!-- Chartbeat Web Analytics code - end -->
-<!-- shared/foot_index -->
-<!-- #CREAM hi news domestic foot.inc -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!-- CPS COMMENT STATUS: false -->
-
-
-<script type="text/javascript" src="BBC_News_Scotland_files/a"></script>
-
-
-
-
-<div class="glow177-cssTest"
style="height:0;position:absolute;visibility:hidden;top:-20px;display:block"></div><script
src="BBC_News_Scotland_files/chartbeat.js" type="text/javascript"
language="javascript"></script></body></html>
\ No newline at end of file
diff --git a/src/plugin/any23/sample/microdata_basic.html
b/src/plugin/any23/sample/microdata_basic.html
deleted file mode 100644
index 3ffca8425..000000000
--- a/src/plugin/any23/sample/microdata_basic.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<html>
-<head>
-<body>
-
-<!-- result0 -->
-<div itemscope>
- <p>My name is <span itemprop="name">Elizabeth</span>.</p>
-</div>
-<!-- result1 -->
-<div itemscope>
- <p>My name is <span itemprop="name">Daniel</span>.</p>
-</div>
-
-<!-- result2 -->
-<div itemscope>
- <p>My name is <span itemprop="name">Neil</span>.</p>
- <p>My band is called <span itemprop="band">Four Parts Water</span>.</p>
- <p>I am <span itemprop="nationality">British</span>.</p>
-</div>
-
-<!-- result3 -->
-<div itemscope>
- <img itemprop="image" src="google-logo.png" alt="Google">
-</div>
-
-<!-- result4 -->
-<div itemscope>
- I was born on <time itemprop="birthday" datetime="2009-05-10">May 10th
2009</time>.
-</div>
-
-<!-- result5 -->
-<div itemscope>
- <p>Flavors in my favorite ice cream:</p>
- <ul>
- <li itemprop="flavor">Lemon sorbet</li>
- <li itemprop="flavor">Apricot sorbet</li>
- </ul>
-</div>
-
-<!-- result6 -->
-<div itemscope>
- <span itemprop="favorite-color favorite-fruit">orange</span>
-</div>
-
-<!-- result7 -->
-<figure>
- <img src="castle.jpeg">
- <figcaption><span itemscope><span itemprop="name">The Castle</span></span>
(1986)</figcaption>
-</figure>
-
-<!-- result8 -->
-<span itemscope><meta itemprop="name" content="The Castle"></span>
-<figure>
- <img src="castle.jpeg">
- <figcaption>The Castle (1986)</figcaption>
-</figure>
-
-<!-- result9 -->
-<section itemscope itemtype="http://example.org/animals#cat">
- <h1 itemprop="name">Hedral</h1>
- <p itemprop="desc">Hedral is a male american domestic shorthair,
- with a fluffy black fur with white paws and belly.</p>
- <img itemprop="img" src="hedral.jpeg" alt="" title="Hedral, age 18 months">
-</section>
-
-<!-- result10 -->
-<dl itemscope
- itemtype="http://vocab.example.net/book"
- itemid="urn:isbn:0-330-34032-8">
- <dt>Title
- <dd itemprop="title">The Reality Dysfunction
- <dt>Author
- <dd itemprop="author">Peter F. Hamilton
- <dt>Publication date
- <dd>
- <time itemprop="pubdate" datetime="1996-01-26">26 January 1996</time>
-</dl>
-
-<!-- result11 -->
-<section itemscope itemtype="http://example.org/animals#cat">
- <h1 itemprop="name http://example.com/fn">Hedral</h1>
- <p itemprop="desc">Hedral is a male american domestic shorthair, with a
fluffy
- <span itemprop="http://example.com/color">black</span> fur with
- <span itemprop="http://example.com/color">white</span> paws and
belly.</p>
- <img itemprop="img" src="hedral.jpeg" alt="" title="Hedral, age 18 months">
-</section>
-
-</body>
-</head>
-</html>
\ No newline at end of file
diff --git
a/src/plugin/any23/src/java/org/apache/nutch/any23/Any23IndexingFilter.java
b/src/plugin/any23/src/java/org/apache/nutch/any23/Any23IndexingFilter.java
deleted file mode 100644
index 09dc32e02..000000000
--- a/src/plugin/any23/src/java/org/apache/nutch/any23/Any23IndexingFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.any23;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.Text;
-import org.apache.nutch.crawl.CrawlDatum;
-import org.apache.nutch.crawl.Inlinks;
-import org.apache.nutch.indexer.IndexingException;
-import org.apache.nutch.indexer.IndexingFilter;
-import org.apache.nutch.indexer.NutchDocument;
-import org.apache.nutch.parse.Parse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * <p>This implementation of {@link org.apache.nutch.indexer.IndexingFilter}
- * adds a <i>triple(s)</i> field to the {@link
org.apache.nutch.indexer.NutchDocument}.</p>
- * <p>Triples are extracted via <a href="https://any23.apache.org/">Apache
Any23</a>.</p>
- * @see org.apache.nutch.any23.Any23ParseFilter
- */
-public class Any23IndexingFilter implements IndexingFilter {
-
- /** Logging instance */
- private static final Logger LOG =
LoggerFactory.getLogger(Any23IndexingFilter.class);
-
- public static final String STRUCTURED_DATA = "structured_data";
-
- private Configuration conf;
-
- /**
- * Get the {@link Configuration} object
- * @see org.apache.hadoop.conf.Configurable#getConf()
- */
- @Override
- public Configuration getConf() {
- return this.conf;
- }
-
- /**
- * Set the {@link Configuration} object
- * @see
org.apache.hadoop.conf.Configurable#setConf(org.apache.hadoop.conf.Configuration)
- */
- @Override
- public void setConf(Configuration conf) {
- this.conf = conf;
- }
-
- /**
- *
- * @param doc
- * document instance for collecting fields
- * @param parse
- * parse data instance
- * @param url
- * page url
- * @param datum
- * crawl datum for the page (fetch datum from segment containing
- * fetch status and fetch time)
- * @param inlinks
- * page inlinks
- * @return filtered NutchDocument
- * @see org.apache.nutch.indexer.IndexingFilter#filter(NutchDocument, Parse,
Text, CrawlDatum, Inlinks)
- *
- * @throws IndexingException if there is a fatl error whilst indexing
- */
- @Override
- public NutchDocument filter(NutchDocument doc, Parse parse, Text url,
CrawlDatum datum, Inlinks inlinks) throws IndexingException {
- String[] metadata =
parse.getData().getParseMeta().getValues(Any23ParseFilter.ANY23_TRIPLES);
-
- if (metadata != null) {
- for (String triple : metadata) {
- Pattern pattern = Pattern.compile("^([^ ]+) ([^ ]+) (.+) \\.");
- Matcher matcher = pattern.matcher(triple);
- if (matcher.find()) {
- Map<String, String> map = new HashMap<>();
- map.put("node", matcher.group(1));
- map.put("key", matcher.group(2));
- map.put("short_key", keyToShortKey(matcher.group(2)));
- map.put("value", matcher.group(3));
- doc.add("structured_data", map);
- } else {
- LOG.warn("Unsupported triple format " + triple);
- }
- }
- }
- return doc;
- }
-
- private static String keyToShortKey(String key) {
- if (key.startsWith("<") && key.endsWith(">")) {
- key = key.substring(1, key.length() - 1);
- }
- String[] keyParts = key.split("/");
- String[] keySubParts = keyParts[keyParts.length - 1].split("#");
- return keySubParts[keySubParts.length - 1];
- }
-}
diff --git
a/src/plugin/any23/src/java/org/apache/nutch/any23/Any23ParseFilter.java
b/src/plugin/any23/src/java/org/apache/nutch/any23/Any23ParseFilter.java
deleted file mode 100644
index bed659f35..000000000
--- a/src/plugin/any23/src/java/org/apache/nutch/any23/Any23ParseFilter.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.any23;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.any23.Any23;
-import org.apache.any23.extractor.ExtractionException;
-import org.apache.any23.filter.IgnoreAccidentalRDFa;
-import org.apache.any23.filter.IgnoreTitlesOfEmptyDocuments;
-import org.apache.any23.mime.TikaMIMETypeDetector;
-import org.apache.any23.mime.purifier.WhiteSpacesPurifier;
-import org.apache.any23.writer.BenchmarkTripleHandler;
-import org.apache.any23.writer.NTriplesWriter;
-import org.apache.any23.writer.TripleHandler;
-import org.apache.any23.writer.TripleHandlerException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.nutch.metadata.Metadata;
-import org.apache.nutch.parse.HTMLMetaTags;
-import org.apache.nutch.parse.HtmlParseFilter;
-import org.apache.nutch.parse.Parse;
-import org.apache.nutch.parse.ParseResult;
-import org.apache.nutch.protocol.Content;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.DocumentFragment;
-
-/**
- * <p>This implementation of {@link org.apache.nutch.parse.HtmlParseFilter}
- * uses the <a href="https://any23.apache.org/">Apache Any23</a> library
- * for parsing and extracting structured data in RDF format from a
- * variety of Web documents. The supported formats can be found at <a
href="https://any23.apache.org/">Apache Any23</a>.
- * <p>In this implementation triples are written as <a
href="https://www.w3.org/TeamSubmission/n3/">Notation3</a>
- * and triples are identified within output triple streams by the presence of
'\n'.
- * The presence of the '\n' is a characteristic specific to N3 serialization
in Any23.
- * In order to use another/other writers implementing the
- * <a
href="https://any23.apache.org/apidocs/index.html?org/apache/any23/writer/TripleHandler.html">TripleHandler</a>
- * interface, we will most likely need to identify an alternative data
characteristic
- * which we can use to split triples streams.</p>
- */
-public class Any23ParseFilter implements HtmlParseFilter {
-
- /** Logging instance */
- private static final Logger LOG =
LoggerFactory.getLogger(Any23ParseFilter.class);
-
- private Configuration conf = null;
-
- /**
- * Constant identifier used as a Key for writing and reading
- * triples to and from the metadata Map field.
- */
- public static final String ANY23_TRIPLES = "Any23-Triples";
-
- public static final String ANY_23_EXTRACTORS_CONF = "any23.extractors";
- public static final String ANY_23_CONTENT_TYPES_CONF = "any23.content_types";
-
- private static class Any23Parser {
-
- Set<String> triples = null;
-
- Any23Parser(String url, String htmlContent, String contentType, String...
extractorNames) throws TripleHandlerException {
- this.triples = new TreeSet<>();
- try {
- parse(url, htmlContent, contentType, extractorNames);
- } catch (URISyntaxException e) {
- LOG.error("Error parsing URI: {}", url, e);
- throw new RuntimeException(e.getReason());
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Maintains a {@link java.util.Set} containing the triples
- * @return a {@link java.util.Set} of triples.
- */
- Set<String> getTriples() {
- return this.triples;
- }
-
- private void parse(String url, String htmlContent, String contentType,
String... extractorNames)
- throws URISyntaxException, IOException, TripleHandlerException {
- Any23 any23 = new Any23(extractorNames);
- any23.setMIMETypeDetector(new TikaMIMETypeDetector(new
WhiteSpacesPurifier()));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try (TripleHandler tHandler = new IgnoreTitlesOfEmptyDocuments(
- new IgnoreAccidentalRDFa(
- new NTriplesWriter(baos)));
- BenchmarkTripleHandler bHandler = new
BenchmarkTripleHandler(tHandler)) {
- try {
- any23.extract(htmlContent, url, contentType, "UTF-8", bHandler);
- } catch (IOException e) {
- LOG.error("Error while reading the source", e);
- } catch (ExtractionException e) {
- LOG.error("Error while extracting structured data", e);
- }
-
- LOG.debug("Any23 BenchmarkTripleHandler.report: " + bHandler.report());
-
- String n3 = baos.toString("UTF-8");
- String[] triplesStrings = n3.split("\n");
- Collections.addAll(this.triples, triplesStrings);
- } catch (IOException e) {
- LOG.error("Unexpected IOException", e);
- }
- }
- }
-
- @Override
- public Configuration getConf() {
- return this.conf;
- }
-
- @Override
- public void setConf(Configuration conf) {
- this.conf = conf;
- }
-
- /**
- * @see org.apache.nutch.parse.HtmlParseFilter#filter(Content, ParseResult,
HTMLMetaTags, DocumentFragment)
- */
- @Override
- public ParseResult filter(Content content, ParseResult parseResult,
HTMLMetaTags metaTags, DocumentFragment doc) {
- String[] extractorNames = this.conf.getStrings(ANY_23_EXTRACTORS_CONF,
"html-head-meta");
- String[] supportedContentTypes =
this.conf.getStrings(ANY_23_CONTENT_TYPES_CONF, "text/html",
"application/xhtml+xml");
- String contentType = content.getContentType();
- if (supportedContentTypes != null &&
!Arrays.asList(supportedContentTypes).contains(contentType)) {
- LOG.debug("Ignoring document at {} because it has an unsupported
Content-Type {}", content.getUrl(), contentType);
- return parseResult;
- }
-
- Any23Parser parser;
- try {
- String htmlContent = new String(content.getContent(),
Charset.forName("UTF-8"));
- parser = new Any23Parser(content.getUrl(), htmlContent, contentType,
extractorNames);
- } catch (TripleHandlerException e) {
- throw new RuntimeException("Error running Any23 parser: " +
e.getMessage());
- }
- Set<String> triples = parser.getTriples();
-
- Parse parse = parseResult.get(content.getUrl());
- Metadata metadata = parse.getData().getParseMeta();
-
- for (String triple : triples) {
- metadata.add(ANY23_TRIPLES, triple);
- }
-
- return parseResult;
- }
-}
diff --git a/src/plugin/any23/src/java/org/apache/nutch/any23/package-info.java
b/src/plugin/any23/src/java/org/apache/nutch/any23/package-info.java
deleted file mode 100644
index 47010768c..000000000
--- a/src/plugin/any23/src/java/org/apache/nutch/any23/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This packages uses the <a href="https://any23.apache.org/">Apache Any23</a>
library
- * for parsing and extracting structured data in RDF format from a
- * variety of Web documents. The supported formats can be found
- * at <a href="https://any23.apache.org/">Apache Any23</a>.
- */
-package org.apache.nutch.any23;
diff --git
a/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23IndexingFilter.java
b/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23IndexingFilter.java
deleted file mode 100644
index 1367e19c4..000000000
---
a/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23IndexingFilter.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.any23;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.nutch.crawl.CrawlDatum;
-import org.apache.nutch.crawl.Inlinks;
-import org.apache.nutch.indexer.NutchDocument;
-import org.apache.nutch.metadata.Metadata;
-import org.apache.nutch.parse.Outlink;
-import org.apache.nutch.parse.ParseData;
-import org.apache.nutch.parse.ParseImpl;
-import org.apache.nutch.parse.ParseStatus;
-import org.apache.nutch.util.NutchConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestAny23IndexingFilter {
- @Test
- public void testAny23TriplesFields() throws Exception {
- Configuration conf = NutchConfiguration.create();
- Any23IndexingFilter filter = new Any23IndexingFilter();
- filter.setConf(conf);
- Assert.assertNotNull(filter);
- NutchDocument doc = new NutchDocument();
- ParseData parseData = new ParseData(ParseStatus.STATUS_SUCCESS, "The Foo
Page",
- new Outlink[] { }, new Metadata());
- ParseImpl parse = new ParseImpl("test page", parseData);
- String[] triples = new String[]{
- "<http://dbpedia.org/resource/Z\u00FCrich>
<http://www.w3.org/2002/07/owl#sameAs> <http://rdf.freebase.com/ns/m.08966> .",
- "<http://dbpedia.org/resource/Z\u00FCrich>
<http://dbpedia.org/property/yearHumidity> \"77\" .",
- "<http://dbpedia.org/resource/Z\u00FCrich>
<http://www.w3.org/2000/01/rdf-schema#label> \"Zurique\"@pt ."
- };
- for (String triple : triples) {
- parse.getData().getParseMeta().add(Any23ParseFilter.ANY23_TRIPLES,
triple);
- }
- try {
- doc = filter.filter(doc, parse, new Text("http://nutch.apache.org/"),
new CrawlDatum(), new Inlinks());
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail(e.getMessage());
- }
- List<Object> docTriples =
doc.getField(Any23IndexingFilter.STRUCTURED_DATA).getValues();
- Assert.assertEquals(docTriples.size(), triples.length);
-
- Object triple = docTriples.get(0);
- Assert.assertTrue(triple instanceof Map<?, ?>);
- @SuppressWarnings("unchecked")
- Map<String, String> structuredData = (Map<String, String>) triple;
- Assert.assertEquals(structuredData.get("node"),
"<http://dbpedia.org/resource/Z\u00FCrich>");
- Assert.assertEquals(structuredData.get("key"),
"<http://www.w3.org/2002/07/owl#sameAs>");
- Assert.assertEquals(structuredData.get("short_key"), "sameAs");
- Assert.assertEquals(structuredData.get("value"),
"<http://rdf.freebase.com/ns/m.08966>");
-
- triple = docTriples.get(1);
- Assert.assertTrue(triple instanceof Map<?, ?>);
- structuredData = (Map<String, String>) triple;
- Assert.assertEquals(structuredData.get("node"),
"<http://dbpedia.org/resource/Z\u00FCrich>");
- Assert.assertEquals(structuredData.get("key"),
"<http://dbpedia.org/property/yearHumidity>");
- Assert.assertEquals(structuredData.get("short_key"), "yearHumidity");
- Assert.assertEquals(structuredData.get("value"), "\"77\"");
- }
-}
diff --git
a/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23ParseFilter.java
b/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23ParseFilter.java
deleted file mode 100644
index 09c253fbc..000000000
--- a/src/plugin/any23/src/test/org/apache/nutch/any23/TestAny23ParseFilter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.any23;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.Text;
-import org.apache.nutch.crawl.CrawlDatum;
-import org.apache.nutch.parse.Parse;
-import org.apache.nutch.parse.ParseException;
-import org.apache.nutch.parse.ParseUtil;
-import org.apache.nutch.parse.ParserNotFound;
-import org.apache.nutch.protocol.Content;
-import org.apache.nutch.protocol.Protocol;
-import org.apache.nutch.protocol.ProtocolFactory;
-import org.apache.nutch.util.NutchConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestAny23ParseFilter {
-
-
- private Configuration conf;
-
- private String fileSeparator = System.getProperty("file.separator");
-
- // This system property is defined in ./src/plugin/build-plugin.xml
- private String sampleDir = System.getProperty("test.data", ".");
-
- // Make sure sample files are copied to "test.data" as specified in
- // ./src/plugin/any23/build.xml during plugin compilation.
- private String file1 = "BBC_News_Scotland.html";
-
- private String file2 = "microdata_basic.html";
-
- private static final int EXPECTED_TRIPLES_1 = 79;
-
- private static final int EXPECTED_TRIPLES_2 = 40;
-
- @Before
- public void setUp() {
- this.conf = NutchConfiguration.create();
- conf.set("file.content.limit", "-1");
- conf.set("parser.timeout", "-1");
- conf.set(Any23ParseFilter.ANY_23_EXTRACTORS_CONF,
"html-embedded-jsonld,html-head-icbm,html-head-links,"
- +
"html-head-meta,html-head-title,html-mf-adr,html-mf-geo,html-mf-hcalendar,html-mf-hcard,"
- +
"html-mf-hlisting,html-mf-hrecipe,html-mf-hresume,html-mf-hreview,html-mf-hreview-aggregate,"
- +
"html-mf-license,html-mf-species,html-mf-xfn,html-microdata,html-rdfa11,html-xpath");
- conf.set(Any23ParseFilter.ANY_23_CONTENT_TYPES_CONF, "text/html");
- }
-
- @Test
- public void testExtractTriplesFromHTML() throws IOException, ParserNotFound,
ParseException {
- String[] triplesArray = getTriples(file1);
-
- Assert.assertEquals("We expect 117 tab-separated triples extracted by the
filter",
- EXPECTED_TRIPLES_1, triplesArray.length);
- }
-
- @Test
- public void extractMicroDataFromHTML() throws ParserNotFound, IOException,
ParseException {
- String[] triplesArray = getTriples(file2);
-
- Assert.assertEquals("We expect 40 tab-separated triples extracted by the
filter",
- EXPECTED_TRIPLES_2, triplesArray.length);
- }
-
- @Test
- public void ignoreUnsupported() throws ParserNotFound, IOException,
ParseException {
- String[] triplesArray = getTriples(file1, "application/pdf");
-
- Assert.assertEquals("We expect no triples extracted by the filter since
content-type should be ignored",
- 0, triplesArray.length);
- }
-
- public String[] extract(String urlString, File file, String contentType) {
- try {
- System.out.println(urlString);
- Protocol protocol = new ProtocolFactory(conf).getProtocol(urlString);
- Content content = protocol.getProtocolOutput(new Text(urlString),
- new CrawlDatum()).getContent();
- content.setContentType(contentType);
- Parse parse = new ParseUtil(conf).parse(content).get(content.getUrl());
- return
parse.getData().getParseMeta().getValues(Any23ParseFilter.ANY23_TRIPLES);
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail(e.toString());
- }
- return null;
- }
-
- private String[] getTriples(String fileName) {
- return getTriples(fileName, "text/html");
- }
-
- private String[] getTriples(String fileName, String contentType) {
- String urlString = "file:" + sampleDir + fileSeparator + fileName;
-
- File file = new File(sampleDir + fileSeparator + fileName);
-
- return extract(urlString, file, contentType);
- }
-}
diff --git a/src/plugin/build.xml b/src/plugin/build.xml
index e83f25273..34688ed56 100755
--- a/src/plugin/build.xml
+++ b/src/plugin/build.xml
@@ -35,7 +35,6 @@
<ant dir="lib-selenium" target="deploy"/>
<ant dir="lib-xml" target="deploy"/>
<!-- real plugins -->
- <ant dir="any23" target="deploy"/>
<ant dir="creativecommons" target="deploy"/>
<ant dir="feed" target="deploy"/>
<ant dir="headings" target="deploy"/>
@@ -114,7 +113,6 @@
<!-- ====================================================== -->
<target name="test">
<parallel threadCount="2">
- <ant dir="any23" target="test"/>
<ant dir="creativecommons" target="test"/>
<ant dir="feed" target="test"/>
<ant dir="headings" target="test"/>
@@ -176,7 +174,6 @@
<!-- Clean all of the plugins. -->
<!-- ====================================================== -->
<target name="clean">
- <ant dir="any23" target="clean"/>
<ant dir="creativecommons" target="clean"/>
<ant dir="feed" target="clean"/>
<ant dir="headings" target="clean"/>
diff --git a/src/plugin/parse-tika/howto_upgrade_tika.txt
b/src/plugin/parse-tika/howto_upgrade_tika.txt
index cb3ed6be8..2dcf76c45 100644
--- a/src/plugin/parse-tika/howto_upgrade_tika.txt
+++ b/src/plugin/parse-tika/howto_upgrade_tika.txt
@@ -33,8 +33,6 @@
$ cd ../language-identifier/
-It should be noted that Any23 also has a dependency on Tika so you may wish to
check that there are no classpath conflicts in the any23 plugin as well.
-
7. Build Nutch and run all unit tests:
$ cd ../../../