Commit Graph

99 Commits

Author SHA1 Message Date
ramonn 9d729baf2a 2014-01-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a typo that prevented timestamps in
	  datalists from being read. Fixes bug #2404.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9297 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-08 15:46:44 +00:00
ramonn d71a39c470 2013-11-13 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a bug when a parent was defined but
	  empty in the XML and an agent with an empty address existed in the
	  database.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9071 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-13 12:09:28 +00:00
zarzuelo 12ee3eafe1 2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Add check to update
	adopted unlinked data modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 15:03:00 +00:00
ramonn 094defb906 2013-08-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm,
	  lib/PandoraFMS/SNMPServer.pm,
	  lib/PandoraFMS/Server.pm,
	  lib/PandoraFMS/PluginServer.pm,
	  lib/PandoraFMS/ProducerConsumerServer.pm,
	  lib/PandoraFMS/PredictionServer.pm,
	  lib/PandoraFMS/ReconServer.pm,
	  lib/PandoraFMS/NetworkServer.pm,
	  lib/PandoraFMS/WMIServer.pm: Added clean-up code to avoid resource
	  leaks when there is a crash and the server has to auto-restart.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-01 09:54:21 +00:00
ramonn 16ca79f181 2013-05-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Add a default module_interval.

	* util/pandora_db.pl: Moved data deletion code to a generic function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8097 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-03 18:00:53 +00:00
ramonn 76d756c40e 2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
	  #3610666.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-17 17:59:49 +00:00
ramonn 34516f29bd 2013-04-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/WMIServer.pm: Style fix.

	* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for multiple ip
	  addresses.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-17 10:49:47 +00:00
ramonn 5782bce170 2013-03-26 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/Tools.pm,
	  lib/PandoraFMS/DataServer.pm,
	  lib/PandoraFMS/ReconServer.pm,
	  bin/pandora_server: Improved pandora_get_os to support custom operating
	  systems and moved it from Tools.pm to Core.pm.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7889 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-26 16:13:15 +00:00
zarzuelo aa8f959083 2013-03-04 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code and fix some
	forgotten changes in last GIS code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7774 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-04 18:06:46 +00:00
ramonn c28bd6b165 2013-03-01 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DB.pm,
	  lib/PandoraFMS/DataServer.pm: Refactored some GIS code. Still needs
	  testing.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7768 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-01 14:27:52 +00:00
darode b923a055dc 2013-02-28 Dario Rodriguez <dario@artica.es>
* lib/PandoraFMS/DataServer.pm: Added feature to update custom
        * field
        on every XML process only with learning mode enabled.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-28 15:38:23 +00:00
zarzuelo c2050ebe53 2013-02-18 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Fixed the exception of "status"
	field of the XML deleted from the supported tags in a previous
	fix for bug 3604850



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7669 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-18 11:44:10 +00:00
zarzuelo 53bff9e703 2013-02-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Fixed a problem with the status
	field of the modules (forced status) in the dataserver creation
	of the module because using create_module_from_hash. 
	Order some code of the same part of the Dataserver



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-13 12:36:08 +00:00
zarzuelo 2e785b165b 2013-02-07 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code on Dataserver,
	improve error message when ignore GIS data, and change the
	way of update parent info (only in learning mode now)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-07 17:01:10 +00:00
ramonn 074f5cf271 2013-01-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for log modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-17 14:38:55 +00:00
darode 3db0805df0 2013-01-09 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a bug which creates modules
        with names which have \n\r and later create problems when editing
        the module information.

	MARGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 12:59:11 +00:00
ramonn ff0c677b36 2012-12-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm,
	  util/pandora_db.pl: Implemented a real not-init status. Small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 14:42:15 +00:00
zarzuelo 4a4bfe9bf5 2012-12-17 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Unset a missed data of the
	parameters hash when create module on dataserver



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7286 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-17 11:05:50 +00:00
ramonn 21dd3eb0e3 2012-11-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added fired alert count.

	* lib/PandoraFMS/DataServer.pm: Do not process more than one XML from
	  the same agent at the same time.

	* util/pandora_db.pl: Recalculate total module count.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7196 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-28 14:33:26 +00:00
zarzuelo ed19ee8843 2012-11-15 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Added support for new agent data in
	the XML as custom_id, url_address and custom fields



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-15 15:20:48 +00:00
zarzuelo b31124e3be 2012-11-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Adopt server to the new fields of
	the agents XML



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 12:31:14 +00:00
ramonn 8a6296caa2 2012-10-24 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/DataServer.pm: Added a new configuration option to
	  make the data server process XML files in a stack instead of a queue.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7086 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-10-24 09:38:08 +00:00
slerena faef022112 2012-04-19 Sancho Lerena <slerena@artica.es>
(Merged from 4.0.x Branch)

        * util/pandora_xml_stress.conf: default path for default agentname list.

        * lib/PandoraFMS/DataServer.pm: Units are not overwrite by an empty XML
        parameter.

        * lib/PandoraFMS/ReconServer.pm: Fixed creation of network components
        with double encoding.

        * lib/PandoraFMS/Core.pm: Applied Junichi patch (from trunk) for detecting
        keepalive in some newer SQL systems. Added a lot of safe_output in logfile.
        Added aditional check for INC types on date collision (same date for different
        data). Fixed generation of some events with double encoding.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6052 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 18:47:57 +00:00
ramonn 672f4681ee 2012-04-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Check for single tag XMLs. Fixes bug #3514207.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5922 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-10 14:21:56 +00:00
slerena 24874818f3 2012-03-07 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Updated version.

        * lib/PandoraFMS/DataServer.pm: Support for "UNIT" tag in the
        XML to update module data units from the XML.

        * util/pandora_csvbridge.pl: New tool to create XML data files
        from CSV files containing data.

        * util/pandora_watchdog.sh: Watchdog for Pandora FMS server,
        taken from the documentation and updated.

        *  util/pandora_dbstress.pl, 
        util/pandora_db.pl: Updated version strings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-03-07 19:42:28 +00:00
ramonn dc8a8e6f1a 2012-02-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for ff interval. Small
	  improvements.
	
	* lib/PandoraFMS/DataServer.pm: Added "timestamp" to the list of
	  valid XML tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5484 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 12:31:08 +00:00
ramonn 445eff3b97 2011-10-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Update the configuration of the
	  module being processed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5097 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-10-28 11:02:35 +00:00
slerena cc854589b9 2011-09-14 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a weird problem resolving GPS
        coordinates with OpenStreet.        




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4950 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-14 10:59:53 +00:00
juanmanuelr 2d708f1827 2011-08-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/DataServer.pm: Added status to supported tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4831 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-26 11:34:48 +00:00
ramonn c665243b5c 2011-08-24 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Exclude the datalist tag from the
	  module's extended_info.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4814 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-24 11:41:27 +00:00
slerena df6d922a69 2011-08-17 Sancho Lerena <slerena@artica.es>
* SNMPServer.pm: Custom value and custom type are not used anymore.
        All extended info comes into custom_oid which stores now all the
        raw info.

        * Core.pm: pandora_evaluate_snmp_alerts() function now uses complex
        regular expression and new macros to allow complex SNMP trap alerts 
        which takes information from the trap info and puts on the alert.

        * DataServer.pm: Fixed notice about undefined GIS position desc.

        * pandora_db.pl: Version update.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4761 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-17 20:11:32 +00:00
ramonn 8faead1358 2011-08-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: When reading module tags use
	  get_tag_value to avoid trouble with empty tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-16 11:37:17 +00:00
ramonn 8d281138ef 2011-08-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Added support for custom module tags
	  (stored in column extended_info).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-08-10 16:58:26 +00:00
zarzuelo 11ee7f6d05 2011-06-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Improved the token ip
	implantation adding the ip to the secondary agent ips



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4496 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-28 15:41:13 +00:00
zarzuelo cccf2ad6fe 2011-06-21 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed numeric condition in a string
	comparation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-21 15:19:43 +00:00
ramonn 872f7d49bc 2011-06-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm: Added a function to get the name of an alert
	  template given the alert id.
	
	* lib/PandoraFMS/Core.pm: Added support for module tags.
	
	* lib/PandoraFMS/DataServer.pm: Do not queue more than max_queue_files
	  files (not max_queue_files + 1!).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 11:07:39 +00:00
ramonn a3f1eaec57 2011-06-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not include BADXML files when
	  evaluating max_queue_files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-02 15:28:29 +00:00
ramonn b8687f5f54 2011-05-23 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm: Applied Koichiro's patch to reuse an
	  already running snmptrapd.

	* lib/PandoraFMS/DataServer.pm: Do not update the configuration of
	  policy modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 13:13:34 +00:00
ramonn ff9b6ecb14 2011-05-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm, lib/PandoraFMS/DataServer.pm: Check that a group
	  exists before auto-creating an agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4297 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-03 14:24:51 +00:00
ramonn 4a7c053919 2011-04-27 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf: Added the dbengine configuration token.

	* lib/PandoraFMS/DataServer.pm: Read aditional module parameters from
	  the XML data file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-04-27 17:44:14 +00:00
ramonn a88b222db2 2011-04-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Module status can be set from the XML
	  data file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4271 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-04-20 15:55:28 +00:00
ramonn a6c3579232 2011-04-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm,
	  lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Fixed module data processing
	  for PostgreSQL and Oracle.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4253 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-04-19 15:32:11 +00:00
raulmateos a274b8cdd0 2011-03-14 Raul Mateos <raulolfpandora@gmail.com>
* lib/PandoraFMS/Config.pm, lib/PandoraFMS/Core.pm,
        lib/PandoraFMS/DataServer.pm, lib/PandoraFMS/DB.pm,
        lib/PandoraFMS/Tools.pm, lib/PandoraFMS/WMIServer.pm: Cleared code and
        updated year.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4089 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-03-14 10:39:31 +00:00
slerena 9e0908125c 2011-03-09 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf
        lib/PandoraFMS/Config.pm
        lib/PandoraFMS/DataServer.pm: Added support for Openstreetmaps
        API for reverse geolocation. 




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4073 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-03-09 13:49:30 +00:00
ramonn d3d72fcc0a 2011-02-28 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a typo. Thanks to Kikuchi Koichiro.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4022 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-28 10:21:03 +00:00
ramonn 632eb5e671 2011-02-23 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: HTML encode events.

	* lib/PandoraFMS/DataServer.pm: Do not reset module parameters
	  unless specifically set in the XML.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3995 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-23 10:50:00 +00:00
ramonn b9204d30ac 2011-02-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not update the module description
	  if it's empty. Fixes bug #3162637.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3880 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-16 16:50:19 +00:00
slerena 8438b49553 2011-02-07 Sancho Lerena <slerena@artica.es>
* pandora_server/DEBIAN/control,
        pandora_server/pandora_server.spec,
        pandora_server/pandora_server.redhat.spec: Added LWP dependency for
        reverse Geocoding feature. This is included on all distros.

        * pandora_server/conf/pandora_server.conf,
        pandora_server/lib/PandoraFMS/Config.pm,
        pandora_server/lib/PandoraFMS/DataServer.pm: Added support for reverse geocoding using
        GoogleMaps api.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3806 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-02-07 13:45:34 +00:00
ramonn 61fbdcd4c6 2010-11-18 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Update agent address from the XML.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3602 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-18 18:24:21 +00:00
zarzuelo 956a3a0955 2010-11-02 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	lib/PandoraFMS/ReconServer.pm
	lib/PandoraFMS/DataServer.pm
	lib/PandoraFMS/Tools.pm: Fixed insert db operations
	in server to store the html entities. This improves
	fix bug 3096436



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-02 17:26:34 +00:00