[Jrobin-commits] src/org/jrobin/demo/graph ExportExportDemo.java,NONE,1.1 ExportImportDemo.java,NONE,1.1 ExportTemplate.java,1.1,1.2

[Arne V. <cob...@us...>]

Update of /cvsroot/jrobin/src/org/jrobin/demo/graph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27003/org/jrobin/demo/graph

Modified Files:
	ExportTemplate.java 
Added Files:
	ExportExportDemo.java ExportImportDemo.java 
Log Message:
JRobin 1.4.0
- Minor tweaks
- Added ExportExportDemo and ExportImportDemo
- Added importXml() with dsNamePrefix to FetchData
- Added demo resources

--- NEW FILE: ExportExportDemo.java ---
/* ============================================================
 * JRobin : Pure java implementation of RRDTool's functionality
 * ============================================================
 *
 * Project Info:  http://www.jrobin.org
 * Project Lead:  Sasa Markovic (sa...@jr...);
 *
 * (C) Copyright 2003, by Sasa Markovic.
 *
 * Developers:    Sasa Markovic (sa...@jr...)
 *                Arne Vandamme (cob...@jr...)
 *
 * This library is free software; you can redistribute it and/or modify it under the terms
 * of the GNU Lesser General Public License as published by the Free Software Foundation;
 * either version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License along with this
 * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 * Boston, MA 02111-1307, USA.
 */
package org.jrobin.demo.graph;

import org.jrobin.graph.RrdExportDef;
import org.jrobin.graph.RrdExportDefTemplate;
import org.jrobin.graph.RrdExport;
import org.jrobin.graph.ExportData;
import org.jrobin.core.RrdException;
import org.jrobin.core.Util;

import java.io.IOException;
import java.io.File;
import java.util.GregorianCalendar;

/**
 * <p>This is a small demo that illustrates JRobin export functionality.</p>
 * 
 * @author Arne Vandamme (cob...@jr...)
 */
public class ExportExportDemo
{
	public static String exportRrd1 	= Util.getJRobinDemoPath( "export-eth0.xml" );
	public static String exportRrd2 	= Util.getJRobinDemoPath( "export-eth1.xml" );
	private static String demoResources = "";

	private static void println( String str ) {
		System.out.println( str );
	}

	private static void prepare( String[] args )
	{
		if ( args.length != 1 )
		{
			println( "Usage: ExportExportDemo <path_to_demo_resources>" );
			println( "  The only argument to this program should be the path to the JRobin" );
			println( "  demo resources.  These are normally included in the JRobin distribution" );
			println( "  in the <jrobin>/res/demo directory." );

			System.exit( 1 );
		}

		demoResources = new File(args[0]).getAbsolutePath() + "/";
	}

	public static void main( String[] args ) throws RrdException, IOException
	{
		prepare( args );

		println( "+----------------------------------------------------------------------------------+" );
		println( "|                            JRobin ExportExportDemo                               |" );
		println( "|                                                                                  |" );
		println( "| This demo will perform the same export on two different rrd files.  In fact the  |" );
		println( "| two RRD files contain the same data, they are data from a network interface and  |" );
		println( "| contain a full days worth of samples on July 3rd 2004.  For this example the RRD |" );
		println( "| are treated as if from two different interfaces: eth0 and eth1.                  |" );
		println( "|                                                                                  |" );
		println( "+----------------------------------------------------------------------------------+" );

		long execStart						= System.currentTimeMillis();

		// -- Read in the export def xml
		println( ">>> Reading export def template\n" );
		RrdExportDefTemplate xmlTemplate	= new RrdExportDefTemplate( new File(demoResources + "exportdef.xml") );

		// -- The data we're interested in is from the 3rd of july 2004, to the 4th
		GregorianCalendar start 			= new GregorianCalendar( 2004, GregorianCalendar.JULY, 3 );
		GregorianCalendar end 				= new GregorianCalendar( 2004, GregorianCalendar.JULY, 4 );

		xmlTemplate.setVariable( "start", start );
		xmlTemplate.setVariable( "end", end );

		Util.getLapTime();

		// -- Exporting the first rrd
		println( ">>> Exporting data from eth0 for July 3rd, 2004" );
		println( ">>> Number of rows for the export is limited to 400." );
		xmlTemplate.setVariable( "rrd", demoResources + "eth0.rrd" );
		RrdExportDef exportDef				= xmlTemplate.getRrdExportDef();
		RrdExport export					= new RrdExport( exportDef );

		// We don't limit the number of rows returned, this will try to auto limit on 400 max
		ExportData dataFromRrd1				= export.fetch();

		// Save the exported data to export xml
		dataFromRrd1.exportXml( exportRrd1 );
		println( ">>> File saved: " + exportRrd1 + " " + Util.getLapTime() + "\n" );

		// -- Exporting the second rrd
		println( ">>> Exporting data from eth1 for July 3rd, 2004" );
		println( ">>> Number of rows for the export is limited to 20." );
		println( "    This means the same data as in the previous export (since in fact" );
		println( "    both RRD files are the same) will be aggregated to around 20 rows." );
		xmlTemplate.setVariable( "rrd", demoResources + "eth1.rrd" );
		exportDef							= xmlTemplate.getRrdExportDef();
		export.setExportDef( exportDef );

		// Now we limit the number of rows retrieved to 20
		ExportData dataFromRrd2				= export.fetch( 20 );

		// Save the exported data to export xml
		dataFromRrd2.exportXml( exportRrd2 );
		println( ">>> File saved: " + exportRrd2 + " " + Util.getLapTime() + "\n" );

		long execStop						= System.currentTimeMillis();

		println( ">>> Demo finished in " + (execStop - execStart) + " milliseconds" );
	}
}

--- NEW FILE: ExportImportDemo.java ---
/* ============================================================
 * JRobin : Pure java implementation of RRDTool's functionality
 * ============================================================
 *
 * Project Info:  http://www.jrobin.org
 * Project Lead:  Sasa Markovic (sa...@jr...);
 *
 * (C) Copyright 2003, by Sasa Markovic.
 *
 * Developers:    Sasa Markovic (sa...@jr...)
 *                Arne Vandamme (cob...@jr...)
 *
 * This library is free software; you can redistribute it and/or modify it under the terms
 * of the GNU Lesser General Public License as published by the Free Software Foundation;
 * either version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License along with this
 * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 * Boston, MA 02111-1307, USA.
 */
package org.jrobin.demo.graph;

import org.jrobin.core.Util;
import org.jrobin.core.RrdException;
import org.jrobin.graph.*;

import java.io.File;
import java.io.IOException;
import java.util.GregorianCalendar;

/**
 * <p>This is a small demo that creates a graph based on the export XML from the ExportExportDemo.</p>
 * 
 * @author Arne Vandamme (cob...@jr...)
 */
public class ExportImportDemo
{
	private static String exportRrd1 		= ExportExportDemo.exportRrd1;
	private static String exportRrd2 		= ExportExportDemo.exportRrd2;
	private static String exportCombined 	= Util.getJRobinDemoPath( "export-combined.xml" );
	private static String graphFile 		= Util.getJRobinDemoPath( "export-graph.png" );
	private static String demoResources 	= "";

	private static void println( String str ) {
		System.out.println( str );
	}

	private static void prepare( String[] args )
	{
		if ( args.length != 1 )
		{
			println( "Usage: ExportImportDemo <path_to_demo_resources>" );
			println( "  The only argument to this program should be the path to the JRobin" );
			println( "  demo resources.  These are normally included in the JRobin distribution" );
			println( "  in the <jrobin>/res/demo directory." );

			System.exit( 1 );
		}

		demoResources = new File(args[0]).getAbsolutePath() + "/";
	}

	public static void main( String[] args ) throws RrdException, IOException
	{
		prepare( args );

		println( "+-----------------------------------------------------------------------------------+" );
		println( "|                             JRobin ExportImportDemo                               |" );
		println( "|                                                                                   |" );
		println( "| This demo supposes the ExportExportDemo has been run and the necessary data has   |" );
		println( "| been exported to the jrobin-demo directory.  The ExportImportDemo creates a graph |" );
		println( "| containing the data from the separate export XML files, the configuration of the  |" );
		println( "| graph is in the RrdGraphDef xml file in the directory passed as argument on the   |" );
		println( "| command line.                                                                     |" );
		println( "|                                                                                   |" );
		println( "+-----------------------------------------------------------------------------------+" );

		long execStart						= System.currentTimeMillis();

		// -- Read in the graph def xml
		RrdGraphDefTemplate xmlTemplate		= new RrdGraphDefTemplate( new File(demoResources + "export-graphdef.xml") );

		// -- The data we're interested in is from the 3rd of july 2004, to the 4th
		GregorianCalendar start 			= new GregorianCalendar( 2004, GregorianCalendar.JULY, 3 );
		GregorianCalendar end 				= new GregorianCalendar( 2004, GregorianCalendar.JULY, 4 );

		xmlTemplate.setVariable( "start", start );
		xmlTemplate.setVariable( "end", end );
		xmlTemplate.setVariable( "export1", exportRrd1 );
		xmlTemplate.setVariable( "export2", exportRrd2 );

		Util.getLapTime();

		// -- Create the graph
		println( ">>> Creating graph image from XML graph def" );
		RrdGraphDef graphDef				= xmlTemplate.getRrdGraphDef();

		RrdGraph graph						= new RrdGraph( graphDef );
		graph.saveAsPNG( graphFile );
		println( ">>> File saved: " + graphFile + " " + Util.getLapTime() + "\n" );

		// -- Dump the combined export
		println( ">>> Dumping combined export xml" );
		ExportData combinedData				= graph.getExportData();
		combinedData.exportXml( exportCombined );
		println( ">>> File saved: " + exportCombined + " " + Util.getLapTime() + "\n" );

		// -- Print out information
		println( ">>> Retrieving AVERAGE outoing traffic from combined export" );
		println( combinedData.print( "eth0-2", "AVERAGE", "  From eth0 data: @5.2 @sbit/s" ) );
		println( combinedData.print( "eth1-2", "AVERAGE", "  From eth1 data: @5.2 @sbit/s" ) );

		long execStop						= System.currentTimeMillis();

		println( "\n>>> Demo finished in " + (execStop - execStart) + " milliseconds" );
	}
}

Index: ExportTemplate.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/demo/graph/ExportTemplate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExportTemplate.java	11 Jul 2004 22:44:59 -0000	1.1
--- ExportTemplate.java	13 Jul 2004 12:16:08 -0000	1.2
***************
*** 91,95 ****
  	public static void main( String[] args )
  	{
! 		if ( args.length < 2 )
  		{
  			System.out.println( "Usage: ExportTemplate [-m width] [-f <dump_file>] <template_file>" );
--- 91,95 ----
  	public static void main( String[] args )
  	{
! 		if ( args.length < 1 )
  		{
  			System.out.println( "Usage: ExportTemplate [-m width] [-f <dump_file>] <template_file>" );