Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item12981: Item13235: Item13406: Update DirectedGraphPluing
Fix several minor issues reported. Update for Foswiki 2.0.
Some suggested fixes provided by JozefMojzis, JohnKnutson.
  • Loading branch information
gac410 committed Jul 19, 2015
1 parent fe825ee commit 871bf16
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 103 deletions.
40 changes: 20 additions & 20 deletions data/Sandbox/DirectedGraphExamples.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1387510438" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1437273589" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%

---+!! Directed Graph Plugin Examples
Expand Down Expand Up @@ -191,7 +191,7 @@ digraph G {
edge [style=dashed]
browser [label="WWW\nbrowser" URL="http://www.mozilla.org/"]
svgplugin [label="SVG Plugin" URL="http://www.adobe.com/svg/viewer/install/old.html"]
pdfplugin [label="PDF Plugin" URL="http://www.adobe.com/support/downloads/product.jsp?product=10&platform=unix"]
pdfplugin [label="PDF Plugin" URL="http://www.adobe.com/support/downloads/product.jsp?product=10;platform=unix"]
svgplugin -> browser
svgplugin -> browser [dir=back]
pdfplugin -> browser
Expand Down Expand Up @@ -284,21 +284,21 @@ digraph G { size="2,3!"; dpi="100";
__Related Topics:__
%SYSTEMWEB%.HowtoDirectedGraphs

%META:FILEATTACHMENT{name="graphsample2.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="graphsample2.png" size="1364" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="graphsample2_antialiased.png" attr="h" autoattached="1" comment="Antialiased sample" date="1172906345" path="graphsample2_antialiased.png" size="12577" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Cloud-Filled.png" size="8648" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Workgroup_Switch.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Workgroup_Switch.png" size="6688" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Laptop.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Laptop.png" size="7372" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="graphsample.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="graphsample.png" size="5197" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="sample_component_architecture.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="sample_component_architecture.png" size="51946" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Sun_Workstation.png" size="6223" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Printer.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Printer.png" size="7747" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Wireless_Router.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Wireless_Router.png" size="7771" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="usecase_sample.png" attr="h" autoattached="1" comment="DOT usecase sample" date="1172906345" path="usecase_sample.png" size="109307" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sample_simple_lan_setup.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="sample_simple_lan_setup.png" size="28102" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.jpg" attachment="Cloud-Filled.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223776982" path="Cloud-Filled.jpg" size="4986" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Laptop.jpg" attachment="Laptop.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777001" path="Laptop.jpg" size="4583" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Printer.jpg" attachment="Printer.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777024" path="Printer.jpg" size="4349" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.jpg" attachment="Sun_Workstation.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777052" path="Sun_Workstation.jpg" size="4481" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Wireless_Router.jpg" attachment="Wireless_Router.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777069" path="Wireless_Router.jpg" size="5046" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Workgroup_Switch.jpg" attachment="Workgroup_Switch.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777089" path="Workgroup_Switch.jpg" size="4483" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="graphsample2.png" attr="h" autoattached="1" date="1437273589" size="1364" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="graphsample2_antialiased.png" attr="h" autoattached="1" date="1437273589" size="12577" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.png" attr="h" autoattached="1" date="1437273589" size="8648" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Workgroup_Switch.png" attr="h" autoattached="1" date="1437273589" size="6688" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Laptop.png" attr="h" autoattached="1" date="1437273589" size="7372" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="graphsample.png" attr="h" autoattached="1" date="1437273589" size="5197" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sample_component_architecture.png" attr="h" autoattached="1" date="1437273589" size="51946" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.png" attr="h" autoattached="1" date="1437273589" size="6223" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Printer.png" attr="h" autoattached="1" date="1437273589" size="7747" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Wireless_Router.png" attr="h" autoattached="1" date="1437273589" size="7771" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="usecase_sample.png" attr="h" autoattached="1" date="1437273589" size="109307" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sample_simple_lan_setup.png" attr="h" autoattached="1" date="1437273589" size="28102" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.jpg" attachment="Cloud-Filled.jpg" attr="h" date="1437273589" size="4986" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Laptop.jpg" attachment="Laptop.jpg" attr="h" date="1437273589" size="4583" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Printer.jpg" attachment="Printer.jpg" attr="h" date="1437273589" size="4349" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.jpg" attachment="Sun_Workstation.jpg" attr="h" date="1437273589" size="4481" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Wireless_Router.jpg" attachment="Wireless_Router.jpg" attr="h" date="1437273589" size="5046" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Workgroup_Switch.jpg" attachment="Workgroup_Switch.jpg" attr="h" date="1437273589" size="4483" user="ProjectContributor" version="1"}%
45 changes: 7 additions & 38 deletions data/System/DirectedGraphPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1287135424" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1437273589" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%

---+!! Directed Graph Plugin
Expand Down Expand Up @@ -265,10 +265,14 @@ Details on how to install cairo, graphviz and imagemagick are beyond the scope o

| Plugin Author: | TWiki:Main.ColeBeck, Foswiki:Main.GeorgeClark |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
| Copyright: | Copyright (C) 2004-2005 Cole Beck, cole.beck@vanderbilt.edu %BR% Copyright (C) 2006-2008 TWiki Contributors %BR% Copyright (C) 2009-2010 George Clark and other Foswiki Contributors |
| Copyright: | Copyright (C) 2004-2005 Cole Beck, cole.beck@vanderbilt.edu %BR% Copyright (C) 2006-2008 TWiki Contributors %BR% Copyright (C) 2009-2015 George Clark and other Foswiki Contributors |
| Plugin Version: | %$VERSION% |
| Plugin Release: | %$RELEASE% |
| Change History: | <!-- versions below in reverse order --> |
| <span style="white-space:nowrap">19 Jul 2015 (1.14):</span> | Foswikitask:Item13406 - Support UNICODE topics. Also fix bug in svg example.<br/> \
Foswikitask:Item12981 - Don't disable plugin during init, just disable rendering for revisions & compare.<br/> \
Foswikitask:Item13235 - Make sure cleanup happens even if dot tags use mixed case.<br/> \
Also adjust Config.spec for Foswiki 2.0. |
| <span style="white-space:nowrap">20 Dec 2013 (1.13):</span> | Foswikitask:Item11164 - Refer to System web name by configuration parameter, support renamed system webs.<br/> \
Foswikitask:Item11401 - Tainting issues on systems running with locales enabled.<br/> \
Foswikitask:Item11470 - linkattachments parmeter not working.<br/> \
Expand Down Expand Up @@ -314,39 +318,4 @@ Details on how to install cairo, graphviz and imagemagick are beyond the scope o
__Related Topics:__
%SYSTEMWEB%.HowtoDirectedGraphs

%META:FILEATTACHMENT{name="graphsample2.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="graphsample2.png" size="1364" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="graphsample2_antialiased.png" attr="h" autoattached="1" comment="Antialiased sample" date="1172906345" path="graphsample2_antialiased.png" size="12577" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Cloud-Filled.png" size="8648" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Workgroup_Switch.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Workgroup_Switch.png" size="6688" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Laptop.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Laptop.png" size="7372" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="graphsample.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="graphsample.png" size="5197" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="sample_component_architecture.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="sample_component_architecture.png" size="51946" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Sun_Workstation.png" size="6223" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Printer.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Printer.png" size="7747" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="Wireless_Router.png" attr="h" autoattached="1" comment="Cisco library icon for sample graph" date="1172906345" path="Wireless_Router.png" size="7771" user="ProjectContributor" version=""}%
%META:FILEATTACHMENT{name="usecase_sample.png" attr="h" autoattached="1" comment="DOT usecase sample" date="1172906345" path="usecase_sample.png" size="109307" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sample_simple_lan_setup.png" attr="h" autoattached="1" comment="Sample DOT graph" date="1172906345" path="sample_simple_lan_setup.png" size="28102" user="Main.ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Cloud-Filled.jpg" attachment="Cloud-Filled.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223776982" path="Cloud-Filled.jpg" size="4986" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Laptop.jpg" attachment="Laptop.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777001" path="Laptop.jpg" size="4583" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Printer.jpg" attachment="Printer.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777024" path="Printer.jpg" size="4349" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Sun_Workstation.jpg" attachment="Sun_Workstation.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777052" path="Sun_Workstation.jpg" size="4481" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Wireless_Router.jpg" attachment="Wireless_Router.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777069" path="Wireless_Router.jpg" size="5046" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Workgroup_Switch.jpg" attachment="Workgroup_Switch.jpg" attr="h" comment="jpg format for antialiased diagram" date="1223777089" path="Workgroup_Switch.jpg" size="4483" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_1.png" attachment="DirectedGraphPlugin_1.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135407" size="37813" stream="GLOB(0xa8702b0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPVN0gQEc21M.png" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_2.png" attachment="DirectedGraphPlugin_2.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135408" size="10197" stream="GLOB(0xa870280)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPovIC7FdPe0.png" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_2.cmapx" attachment="DirectedGraphPlugin_2.cmapx" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135408" size="614" stream="GLOB(0xa998720)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPkxbjfNb6Xx.cmapx" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_3.png" attachment="DirectedGraphPlugin_3.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135413" size="16039" stream="GLOB(0xa86f410)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPfmHBJ0l00C.png" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_3.cmapx" attachment="DirectedGraphPlugin_3.cmapx" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135408" size="614" stream="GLOB(0xa9989e0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPjYSwkTdAjJ.cmapx" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_3.ps" attachment="DirectedGraphPlugin_3.ps" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135408" size="5373" stream="GLOB(0xa9989a0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGP70iHqJuj6Y.ps" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_4.png" attachment="DirectedGraphPlugin_4.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135418" size="244890" stream="GLOB(0xa990e80)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPcz1M7rKtKi.png" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_4.ps" attachment="DirectedGraphPlugin_4.ps" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135414" size="20232" stream="GLOB(0xa870380)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPk4zpvZzdya.ps" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_4.dot.txt" attachment="DirectedGraphPlugin_4.dot.txt" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135414" size="4307" stream="GLOB(0xa998850)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPteRrrGfggQ.dot" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_5.png" attachment="DirectedGraphPlugin_5.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135419" size="28334" stream="GLOB(0xa86f6c0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPkntDO6c0dV.png" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_5.cmapx" attachment="DirectedGraphPlugin_5.cmapx" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135419" size="1975" stream="GLOB(0xa86f4a0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPFWeqqB3nqq.cmapx" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_5.svg" attachment="DirectedGraphPlugin_5.svg" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135420" size="9137" stream="GLOB(0xa86f4b0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPbsEd4Iu8qm.svg" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_5.dot.txt" attachment="DirectedGraphPlugin_5.dot.txt" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135419" size="2719" stream="GLOB(0xa9988a0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPeSvGDkl7lF.dot" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_6.png" attachment="DirectedGraphPlugin_6.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135422" size="19394" stream="GLOB(0xa998bf0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPXTzOHMEBy6.png" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_6.dot.txt" attachment="DirectedGraphPlugin_6.dot.txt" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135422" size="974" stream="GLOB(0xa991210)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPRatELM8iZo.dot" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_7.png" attachment="DirectedGraphPlugin_7.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135423" size="65134" stream="GLOB(0xa9de2d8)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPj9uMg5NhIv.png" user="BaseUserMapping_333" version="2"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_7.ps" attachment="DirectedGraphPlugin_7.ps" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135423" size="203035" stream="GLOB(0xa998cc0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPFt1lGxYjub.ps" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="DirectedGraphPlugin_7.dot.txt" attachment="DirectedGraphPlugin_7.dot.txt" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1287135423" size="974" stream="GLOB(0xa998cf0)" tmpFilename="/home/www/fw_1x0/core/working/tmp/DGPZOR7dSbDfL.dot" user="BaseUserMapping_333" version="1"}%
%META:FILEATTACHMENT{name="graphsample2_antialiased.png" attr="h" autoattached="1" date="1437273589" size="12577" user="ProjectContributor" version="1"}%

0 comments on commit 871bf16

Please sign in to comment.