[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/quality-kde-org] sanitizer: Remove references to Frerich who hasn't been involved with KDE
From: Allen Winter <allen.winter () kdab ! com>
Date: 2015-10-13 19:41:17
Message-ID: E1Zm5Rl-0000Wg-N7 () scm ! kde ! org
[Download RAW message or body]
Git commit a9895caab8f27bb50bca1ea8c24f570193cc4979 by Allen Winter.
Committed on 13/10/2015 at 19:40.
Pushed by winterz into branch 'master'.
Remove references to Frerich who hasn't been involved with KDE for years.
CCMAIL: frerich.raabe@googlemail.com
M +7 -11 sanitizer/just-in-time.php
M +26 -34 sanitizer/tools/check-doctype.py
M +12 -14 sanitizer/tools/check-xml-syntax.sh
M +26 -28 sanitizer/tools/run_insert_entities.py
http://commits.kde.org/websites/quality-kde-org/a9895caab8f27bb50bca1ea8c24f570193cc4979
diff --git a/sanitizer/just-in-time.php b/sanitizer/just-in-time.php
index 771ba05..f82bd95 100644
--- a/sanitizer/just-in-time.php
+++ b/sanitizer/just-in-time.php
@@ -16,21 +16,18 @@ computer.</li>
<li>Finally, markup can be <a href="#direct">specified directly</a> online,
usually by copy & paste from some other location.</li>
</ul>
-<p>If you have any suggestions how to improve this site, or would like to
-comment on additional or flawed checks, please don't hesitate to contact
-<a href="mailto:raabe@kde.org">Frerich Raabe</a>.</p>
<h2><a name="by-url">Validate by URL</a></h2>
<form method="get" action="/cgi-bin/check.py">
- <label title="Address of document to check" for="uri">Address: <input \
class="uri" name="uri" size="40"/></label>
- <label title="Submit address"><input type="submit" value="Check"/></label>
+ <label title="Address of document to check" for="uri">Address: <input \
class="uri" name="uri" size="40"/></label> + <label title="Submit \
address"><input type="submit" value="Check"/></label> </form>
<p>Enter the <abbr title="Uniform Resource Locator">URL</abbr> which references
the document you would like to check.</p>
<h2><a name="upload">Validate by File Upload</a></h2>
<form method="post" enctype="multipart/form-data" action="/cgi-bin/check.py">
- <label title="Choose a local file to upload and check" for="uploaded_file">Local \
file: <input type="file" class="uploaded_file" name="uploaded_file" \
size="30"/></label>
- <label title="Submit file"><input type="submit" value="Check"/></label>
+ <label title="Choose a local file to upload and check" \
for="uploaded_file">Local file: <input type="file" class="uploaded_file" \
name="uploaded_file" size="30"/></label> + <label title="Submit file"><input \
type="submit" value="Check"/></label> </form>
<p>Select a file on your local harddisk which shall be uploaded and
checked. Note that in very rare cases (in particular, when you're using
@@ -40,13 +37,12 @@ case.</p>
<h2><a name="direct">Validate by Input</a></h2>
<form method="post" enctype="multipart/form-data" action="/cgi-bin/check.py">
- <label title="Paste a complete DocBook document here" for="markup"><textarea \
cols="70" rows="12" name="markup" class="markup" style="height: \
300px"></textarea></label><br/>
- <label title="Submit markup"><input type="submit" value="Check"/></label>
+ <label title="Paste a complete DocBook document here" for="markup"><textarea \
cols="70" rows="12" name="markup" class="markup" style="height: \
300px"></textarea></label><br/> + <label title="Submit markup"><input \
type="submit" value="Check"/></label> </form>
<p>You can paste some DocBook markup here to have it checked. Note that
even though checking little fragments of markup is perfectly possible, the
test which checks for whether the input is valid XML might fail.</p>
<?php
- include 'footer.inc';
+ include 'footer.inc';
?>
-
diff --git a/sanitizer/tools/check-doctype.py b/sanitizer/tools/check-doctype.py
index ff85f9b..7a89cf4 100755
--- a/sanitizer/tools/check-doctype.py
+++ b/sanitizer/tools/check-doctype.py
@@ -10,53 +10,45 @@ catalogFile = "/home/api/bin/sanitizer/docbook-catalog-nonxml"
catalogDecl = ""
for line in open(catalogFile).readlines():
if line[:6] == "PUBLIC":
- firstQuote = line.find('"', 6) + 1
- if firstQuote == 0:
- break
+ firstQuote = line.find('"', 6) + 1
+ if firstQuote == 0:
+ break
- secondQuote = line.find('"', firstQuote)
- if secondQuote == -1:
- break
+ secondQuote = line.find('"', firstQuote)
+ if secondQuote == -1:
+ break
- catalogDecl = line[firstQuote:secondQuote]
- break
+ catalogDecl = line[firstQuote:secondQuote]
+ break
if not catalogDecl:
- print "Failed to determine catalog declaration! Please drop a "
- print "mail to <a href=\"mailto:raabe@kde.org\">Frerich "
- print "Raabe</a> about this, it's most likely a server "
- print "misconfiguration."
- sys.exit(1)
+ print "Failed to determine catalog declaration! "
+ print "It's most likely a server misconfiguration."
+ sys.exit(1)
docbookDecl = ""
for line in open(sys.argv[1]).readlines():
if line[:9] == "<!DOCTYPE":
- firstQuote = line.find('"', 9) + 1
- if firstQuote == 0:
- break
+ firstQuote = line.find('"', 9) + 1
+ if firstQuote == 0:
+ break
- secondQuote = line.find('"', firstQuote)
- if secondQuote == -1:
- break
+ secondQuote = line.find('"', firstQuote)
+ if secondQuote == -1:
+ break
- docbookDecl = line[firstQuote:secondQuote]
- break
+ docbookDecl = line[firstQuote:secondQuote]
+ break
if not docbookDecl:
- print "Failed to determine DOCTYPE declaration! If you do have "
- print "a <span style=\"markup\"><!DOCTYPE ..</span> declaration "
- print "in your markup, please drop a note about this false alert "
- print "to <a href=\"mailto:raabe@kde.org\">Frerich "
- print "Raabe</a> about this, together with the markup you gave to "
- print "the sanitizer."
- sys.exit(1)
+ print "Failed to determine DOCTYPE declaration!"
+ sys.exit(1)
if catalogDecl != docbookDecl:
- print "The DOCTYPE declaration doesn't seem to be the same version "
- print "as the catalog's declaration.<br/>"
- print "Your markup: <span class=\"markup\">%s</span><br/>" % docbookDecl
- print "Catalog: <span class=\"markup\">%s</span><br/>" % catalogDecl
- sys.exit(1)
+ print "The DOCTYPE declaration doesn't seem to be the same version "
+ print "as the catalog's declaration.<br/>"
+ print "Your markup: <span class=\"markup\">%s</span><br/>" % docbookDecl
+ print "Catalog: <span class=\"markup\">%s</span><br/>" % catalogDecl
+ sys.exit(1)
sys.exit(0)
-
diff --git a/sanitizer/tools/check-xml-syntax.sh \
b/sanitizer/tools/check-xml-syntax.sh index 71876ea..405d2d6 100755
--- a/sanitizer/tools/check-xml-syntax.sh
+++ b/sanitizer/tools/check-xml-syntax.sh
@@ -6,9 +6,8 @@ tmpfile=`mktemp -t ${myname}.XXXXXXXXXX` || exit 1
CHECKXML=/usr/bin/checkXML
if [ ! -x $CHECKXML ]; then
- echo "<p>Failed to run <tt>checkXML</tt> program. Please drop a mail "
- echo "to <a href=\"mailto:raabe@kde.org\">Frerich Raabe</a> about this."
- exit 1
+ echo "<p>Failed to run <tt>checkXML</tt> program."
+ exit 1
fi
$CHECKXML $1 > $tmpfile 2>&1
@@ -18,20 +17,19 @@ echo "<ul>"
exec 3<&0
exec 0<$tmpfile
while read line; do
- if echo $line | grep '^index\.docbook' > /dev/null 2>&1; then
- echo "<li>"
- echo $line | sed -e 's,^index\.docbook:\([0-9]*\):[^:]*,In line <div \
span="lineno">\1</div>,'
- read line
- echo -n "<p class=\"dbexcerpt\">"
- echo -n $line | sed -e 's,&,&,g' | sed -e 's,<,<,g' | sed -e 's,>,>,g'
- echo "</p>"
- read line
- echo "</li>"
- fi
+ if echo $line | grep '^index\.docbook' > /dev/null 2>&1; then
+ echo "<li>"
+ echo $line | sed -e 's,^index\.docbook:\([0-9]*\):[^:]*,In line <div \
span="lineno">\1</div>,' + read line
+ echo -n "<p class=\"dbexcerpt\">"
+ echo -n $line | sed -e 's,&,&,g' | sed -e 's,<,<,g' | sed -e \
's,>,>,g' + echo "</p>"
+ read line
+ echo "</li>"
+ fi
done
echo "</ul>"
rm -f $tmpfile
exit $returnCode
-
diff --git a/sanitizer/tools/run_insert_entities.py \
b/sanitizer/tools/run_insert_entities.py index 991faf9..f389139 100755
--- a/sanitizer/tools/run_insert_entities.py
+++ b/sanitizer/tools/run_insert_entities.py
@@ -8,47 +8,45 @@ tmpFile = tempfile.NamedTemporaryFile()
cmd = "%s/insert_entities -k -e \
/srv/sources/kde-4.x/kdelibs/kdoctools/customization/entities %s" % \
(os.path.dirname(sys.argv[0]), sys.argv[1]) args=cmd.split(' ')
if not os.path.exists(args[0]):
- print >> sys.stderr, "\ninsert_entities program not found at", args[0]
- sys.exit(1)
+ print >> sys.stderr, "\ninsert_entities program not found at", args[0]
+ sys.exit(1)
p = subprocess.Popen(args, 0, None, None, tmpFile)
errors = p.wait()
if errors == 0:
- sys.exit(0)
+ sys.exit(0)
cmd = "diff -U0 %s %s" % (sys.argv[1], tmpFile.name)
p = subprocess.Popen(cmd.split(' '), 0, None, None, subprocess.PIPE)
if p.wait() == 2:
- sys.exit(0)
+ sys.exit(0)
-print "<p><b>Note</b>:It is not guaranteed that the document is still valid after \
applying these suggestions! If you"
-print "happen to see a suggestion which would break the document, please send <a \
href=\"mailto:raabe@kde.org\">Frerich"
-print "Raabe</a> a mail about it.</p>"
+print "<p><b>Note</b>:It is not guaranteed that the document is still valid after \
applying these suggestions!</p>" print "<ul>"
output = p.stdout.readlines()
for i in range(len(output)):
- line = output[i].strip()
- if line[0] != '@':
- continue
-
- lineNo = line[4:line.find(' ', 4) + 1]
- comma = lineNo.find(',')
- if comma:
- lineNo = lineNo[:comma]
-
- print "<li>"
- print "Entity could be used in line <span class=\"lineno\">%s</span>:" % lineNo
- print "<pre class=\"dbexcerpt\">"
- i += 1
- while i < len(output):
- line = output[i].strip()
- if line[0] not in ('+', '-'):
- break
- print line.replace('&', '&').replace('<', '<').replace('>', '>')
- i += 1
- print "</pre>"
- print "</li>"
+ line = output[i].strip()
+ if line[0] != '@':
+ continue
+
+ lineNo = line[4:line.find(' ', 4) + 1]
+ comma = lineNo.find(',')
+ if comma:
+ lineNo = lineNo[:comma]
+
+ print "<li>"
+ print "Entity could be used in line <span class=\"lineno\">%s</span>:" % \
lineNo + print "<pre class=\"dbexcerpt\">"
+ i += 1
+ while i < len(output):
+ line = output[i].strip()
+ if line[0] not in ('+', '-'):
+ break
+ print line.replace('&', '&').replace('<', '<').replace('>', \
'>') + i += 1
+ print "</pre>"
+ print "</li>"
print "</ul>"
print sys.exit(errors)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic