phpweather-checkins — CVS checkins are sent to this list.

CVS: web/docs/2.x index.php,NONE,1.1

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/docs/2.x
In directory usw-pr-cvs1:/tmp/cvs-serv21623/2.x

Added Files:
	index.php 
Log Message:
A couple of index-files.


--- NEW FILE ---
<?php include('../../include/header.php'); ?>

<p>There isn't much to be said about PHP Weather version 2.x yet, as
we're still working on it. But we know this:</p>

<dl>
  
  <dt>It requires PHP version 4</dt>
  
  <dd><p>This is necessary because PHP Weather 2 uses many functions
    introduced in that version of PHP.</p></dd>
    
  <dt>It supports more databases than PHP Weather 1.x</dt>

  <dd><p>The databases are now accessed through an abstraction-layer.
    This means that it's easy to support new types of databases.
    There's even a database backend that relies on normal files, so
    that everybody should be able to use it.</p></dd>
   
</dl>

<p>If you're interested in the development of this version, then
please have a look at the code in <a
href="http://sourceforge.net/cvs/?group_id=23245">CVS</a>.</p>

<?php include('../../include/footer.php'); ?>

CVS: web/docs/1.x dbcaching.php,NONE,1.1 demo.php,NONE,1.1 index.php,...

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/docs/1.x
In directory usw-pr-cvs1:/tmp/cvs-serv21354

Added Files:
	dbcaching.php demo.php index.php translation.php using.php 
	usingwap.php 
Log Message:
This is basically the old files from gimpster.com.


--- NEW FILE ---
<?php
/* 	$Id: dbcaching.php,v 1.1 2002/03/18 17:36:39 gimpster Exp $	 */
require('../../include/header.php');
?>

<p>But you'll soon start to look for a way to improve the
response-time of your script. To do this, you first have to decide
what database you want to use. You have a number of options at this
time:</p>

<dl>
    
<dt>A MySQL database</dt>

<dd>
  <p>Set <code>$useMySQL</code> to 1, and then create a table with the
  following SQL statement:</p>

<pre>
CREATE TABLE metars (
  metar VARCHAR(255) NOT NULL,
  timestamp TIMESTAMP(14),
  station VARCHAR(4) NOT NULL,
  PRIMARY KEY (station),
  UNIQUE station (station)
);
</pre>

</dd>

<dt>A PostgreSQL database</dt>

<dd>
  <p>Set <code>$usePSQL</code> to 1 and create a table with the
  following SQL statement:</p>

<pre>
CREATE TABLE metars (
  metar VARCHAR(255) NOT NULL,
  timestamp TIMESTAMP,
  station VARCHAR(4) PRIMARY KEY NOT NULL
);
</pre>

</dd>

<dt>An Oracle 8 database</dt>

<dd>
  <p>Set <code>$useOCI</code> to 1 and create a table with this SQL
  statement:</p>

<pre>
create table metars (
  metar varchar2(255) not null,
  timestamp date,
  station varchar2(4)
);
alter table metars add primary key (station);
</pre>
</dd>

<dt>A DBM database</dt>

<dd>
  <p>Set <code>$useDBM</code> to 1 and make make sure that the user
  running the webserver has write-permission to the current
  directory.</p>
</dd>

<dt>An XML file</dt>

<dd>
  <p>Set <code>$useXML</code> to 1 and make sure that the webserver
  has read/write permission to the file <code>cache.xml</code>.</p>
</dd>

</dl>

<p>If you use a database that requires you to log on, then please
remember to do so. There's already some code at the top of
<code>phpweather.inc</code> that should serve as a guide.</p>

<p>If you don't connect to your database, you'll recieve a lot of
errors, saying things like: &quot;<code>MySQL Connection Failed:
Access denied for user: 'nobody@localhost' (Using password: NO) in
phpweather.inc</code>&quot; and &quot;<code>Supplied argument is not a
valid MySQL result resource in phpweather.inc</code>&quot;. These
errors are trying to tell you, that PHP Weather couldn't store the
METAR in the MySQL-database,
because you didn't supply a valid username and password. The errors
will be similar for other databases.</p>

<p>If you've configured PHP Weather and the database correctly, PHP
Weather will store the retrieved METARs in the database, and use the
cached METAR if it's less that 1 hour old. If it's older, it is
expected that the station has made a new observation, so we should
update our data.</p>

<?php require('../../include/header.php'); ?>


--- NEW FILE ---
<?php
/* 	$Id: demo.php,v 1.1 2002/03/18 17:36:39 gimpster Exp $	 */
require('../../include/header.php');
require('../../phpweather-1.x/phpweather.inc');
?>

<p>This is the extended demo. Here you'll be able to play with PHP
Weathers ability to show the weather in several different
languages.</p>

<p>This piece of text is made just like the one on the <a
href="index.php">frontpage</a>. The only difference is, that this one
shows the current weather in Honolulu, Hawaii, and that the
information is presented in Spanish. First comes the raw METAR:</p>

<blockquote><code><? echo $metar = get_metar('PHNL', 1) ?></code></blockquote>

<p>and then the Spanish pretty-printed output:</p>

<?php
require('../../phpweather-1.x/locale_es.inc');
pretty_print_metar($metar, 'Honolulu, Hawaii');
?>

<p>The only thing I changed between the two pieces of code was the
identifier of the weather station, and the include-file with the
strings used by PHP Weather. The identifier for Aalborg, Denmark is
<code>EKYT</code> and the one for Honolulu, Hawaii is
<code>PHNL</code>.</p>

<p>Try it out for yourself - choose a city and a language from the
lists and you'll see the current weather for the city you
selected:</p>

<form action="demo.php" method="post">
<select name="city" onChange="this.form.submit()">

<? 

$cities = array(
  'BGTL' => 'Thule A. B., Greenland',
  'EGKK' => 'London / Gatwick Airport, United Kingdom',
  'EKYT' => 'Aalborg, Denmark',
  'EKCH' => 'Copenhagen / Kastrup, Denmark',
  'ENGM' => 'Oslo / Gardermoen, Norway',
  'ESSA' => 'Stockholm / Arlanda, Sweden',
  'FCBB' => 'Brazzaville / Maya-Maya, Congo',
  'LEMD' => 'Madrid / Barajas, Spain',
  'LFPB' => 'Paris / Le Bourget, France',
  'LIRA' => 'Roma / Ciampino, Italy',
  'KNYC' => 'New York City, Central Park, NY, United States',
  'NZCM' => 'Williams Field, Antarctic',
  'UUEE' => 'Moscow / Sheremet\'Ye , Russian Federation',
  'RKSS' => 'Seoul / Kimp\'O International Airport, Korea',
  'YSSY' => 'Sydney Airport, Australia',
  'ZBAA' => 'Beijing, China'
  );

while (list($icao, $location) = each($cities)) {
  if ($icao == $city) {
    echo "<option selected value=\"$icao\">$location</option>\n";
  } else {
    echo "<option value=\"$icao\">$location</option>\n";
  }
} ?>
</select>
<select name="language">
<?
$languages = array(
  'po_br' => 'Brazilian Portuguese',
  'cz'    => 'Czech',
  'da'	  => 'Danish',
  'nl'	  => 'Dutch',
  'en'	  => 'English',
  'fr'	  => 'French',
  'de'	  => 'German',
  'it'	  => 'Italian',
  'no'	  => 'Norwegian',
  'es'	  => 'Spanish'
  );

while (list($lang_code, $locale) = each($languages)) {
  if ($lang_code == $language) {
    echo "<option selected value=\"$lang_code\">$locale</option>\n";
  } else {
    echo "<option value=\"$lang_code\">$locale</option>\n";
  }
} ?>
</select>
<input type="submit">
</form>

<?
if (!isset($city)) {
  $city = 'BGTL';
  $language = 'en'; 
}
$metar = get_metar($city, 1);
include("../../phpweather-1.x/locale_$language.inc");
pretty_print_metar($metar, $cities[$city]) ?>

<p>The METAR for <? echo $cities[$city] ?>, presented in <? echo
$languages[$language] ?>, was:</p>

<blockquote><code><? echo $metar ?></code></blockquote>

<?php
require('../../include/footer.php');
?>

--- NEW FILE ---
<?php
require('../../include/header.php');
require('../../phpweather-1.x/locale_en.inc');
require('../../phpweather-1.x/phpweather.inc');

$metar = get_metar('EKYT', 0);
?>

<img src="../../images/phpweather.jpg" width="103" height="128"
alt="PHP Weather" align="right">

<p>This is the documentation for PHP Weather version 1.x. If you're
using PHP version 4 or greather, then you should use the newer version
2 of PHP Weather instead. PHP Weather 1.x is still here for people who
still use PHP version 3, as PHP Weather 1.x is known to on version of
PHP all the way back to 3.0.3.</p>

<p>PHP Weather is a script written in PHP, that will decode a METAR
weather report. Every hour a round the clock airports make a
METAR-report where they measure things like the temperature, the wind
speed and direction etc. This information is available on the
Internet. PHP Weather retrieves this information and can cache the
METARs in a database so subsequent request for the same station will
be served as fast as possible.</p>

<p>But the report is not just saved in plain-text. Its coded in a
special code, so it has to be decoded before you can use it. This is
what PHP Weather is for, decoding a METAR into plain-text, so you can
use for something useful.</p>

<h2>A sample METAR-report</h2>

<p>The report below is the latest from Aalborg, Denmark (this is where
I live). The raw METAR looks like this:</p>

<blockquote><code><? echo $metar ?></code></blockquote>

<p>Not exactly a pretty sight? Well by using PHP Weather you could
also present the information like this:</p>

<?php pretty_print_metar($metar, 'Aalborg, Denmark') ?>

<?php require('../../include/footer.php'); ?>

--- NEW FILE ---
<?php
/* 	$Id: translation.php,v 1.1 2002/03/18 17:36:40 gimpster Exp $	 */
require('../../include/header.php');
?>

<p>As you have no doubt noticed, PHP Weather has been translated into
several different languages. I'm very grateful to all who have
contribuated by doing this - see the AUTHORS-file for details.</p>

<p>To use a translation, you only have to include the associated
<code>locale_??.inc</code>-file. Here <code>??</code> should be
substituted with the language-code of the country in question. So, to
have the weather written in first in English and then in Norwegian,
just execute the following code:</p>

<code><font color="#000000">
<font color="#0000BB">&lt;?php<br></font><font color="#007700">include(</font><font color="#DD0000">'locale_en.inc'</font><font color="#007700">);<br>include(</font><font color="#DD0000">'phpweather.inc'</font><font color="#007700">);<br></font><font color="#0000BB">pretty_print_metar</font><font color="#007700">(</font><font color="#0000BB">get_metar</font><font color="#007700">(</font><font color="#DD0000">'EKYT'</font><font color="#007700">),&nbsp;</font><font color="#DD0000">'Aalborg,&nbsp;Denmark'</font><font color="#007700">);<br>include(</font><font color="#DD0000">'locale_no.inc'</font><font color="#007700">);<br></font><font color="#0000BB">pretty_print_metar</font><font color="#007700">(</font><font color="#0000BB">get_metar</font><font color="#007700">(</font><font color="#DD0000">'EKYT'</font><font color="#007700">),&nbsp;</font><font color="#DD0000">'Aalborg,&nbsp;Denmark'</font><font color="#007700">);<br></font><font color="#0000BB">?&gt;<br></font>
</font>
</code>

<p>If you want to do a translation, then follow these steps:</p>
<ol>
  
  <li><p>You'll need something to translate :-) You can use any of the
  already-made translations as a template, so pick one. The English
  translation is the original.</p></li>

  <li><p>Make a copy of your chosen template, and rename it
  <code>locale_??.inc</code>, where <code>??</code> is the normal
  abbreviation for your country, eg. <code>dk</code> for Denmark,
  <code>en</code> for England etc.</p></li>

  <li><p>Change the name of the author and email-address to you name
  and email-address.</p></li>

  <li><p>Here comes the difficult part: translate every string in the
  file, but leave the <code>%s</code> intact. It is these codes that
  will be replaced by the actual numbers and strings when the script is
  executed.</p>

  <p>Here's an example: &quot;<code>&lt;b&gt;%s&lt;/b&gt; mm
  (&lt;b&gt;%s&lt;/b&gt; inches)</code>&quot; becomes
  &quot;<code>&lt;b&gt;12.7&lt;/b&gt; mm (&lt;b&gt;0.5&lt;/b&gt;
  inches)</code>&quot;. This string is then used in the next piece:
  &quot;<code>There was %s of precipitation</code>&quot;, which then
  becomes &quot;<code>There was &lt;b&gt;12.7&lt;/b&gt; mm
  (&lt;b&gt;0.5&lt;/b&gt; inches) of precipitation</code>&quot;. I
  hope you get the idea.</p></li>

  <li><p>Remember to translate all special characters (things like
  &aring;, &uuml;, &oacute; etc) to their html-entities.</p></li>

  <li><p>When you're done, and have tested your translation, send it
  to the <a
  href="mailto:php...@li...">phpweather-devel</a>
  mailinglist at <a href="http://www.sourceforge.net/">SourceForge</a>.
  Someone will then put it into CVS and it will be included in the
  next release.</p></li>

</ol>

<p>Good luck on translating PHP Weather! Here's your chance to help me
out - you don't have to know anything about the code to contribute,
and it's a great way to tell me, that you like the script.</p>

<?php
require('../../include/footer.php');
?>

--- NEW FILE ---
<?php
/* 	$Id: using.php,v 1.1 2002/03/18 17:36:40 gimpster Exp $	 */
require('../../include/header.php');
require('../../phpweather-1.x/phpweather.inc');
require('../../phpweather-1.x/locale_en.inc');
?>

<p>Using PHP Weather is very simple. First you have to include the
file <code>phpweather.inc</code> in your page. Then you call the
function <code>get_metar()</code> with the four-character
station-identifier. This gives you the METAR, which you can then feed
to <code>process_metar()</code>. This function return an array that
contains the various parts of the METAR in decoded form. They are also
returned in both imperial (feet, miles, degrees of Fahrenheit, etc.)
and metric SI units (meters, kilometers and degrees Celsius).</p>
<p>This code is all that is <i>necessary</i> to make PHP Weather
work:</p>

<code><font color="#000000">
<font color="#0000BB">&lt;?php<br></font><font color="#007700">include(</font><font color="#DD0000">'phpweather.inc'</font><font color="#007700">);<br>include(</font><font color="#DD0000">'locale_en.inc'</font><font color="#007700">);<br></font><font color="#0000BB">$metar&nbsp;&nbsp;</font><font color="#007700">=&nbsp;</font><font color="#0000BB">get_metar</font><font color="#007700">(</font><font color="#DD0000">'EKYT'</font><font color="#007700">);<br></font><font color="#0000BB">$data&nbsp;&nbsp;&nbsp;</font><font color="#007700">=&nbsp;</font><font color="#0000BB">process_metar</font><font color="#007700">(</font><font color="#0000BB">$metar</font><font color="#007700">);<br></font><font color="#0000BB">$temp_c&nbsp;</font><font color="#007700">=&nbsp;</font><font color="#0000BB">$data</font><font color="#007700">[</font><font color="#DD0000">'temp_c'</font><font color="#007700">];<br></font><font color="#0000BB">$temp_f&nbsp;</font><font color="#007700">=&nbsp;</font><font color="#0000BB">$data</font><font color="#007700">[</font><font color="#DD0000">'temp_f'</font><font color="#007700">];<br>echo&nbsp;</font><font color="#DD0000">"&lt;p&gt;The&nbsp;temperature&nbsp;is&nbsp;$temp_c&nbsp;degrees&nbsp;Celsius&nbsp;($temp_f&nbsp;degrees&nbsp;Fahrenheit).&lt;/p&gt;"</font><font color="#007700">;<br></font><font color="#0000BB">?&gt;<br></font>
</font>
</code>

<p>That's it! The above code will tell you what the temperature is in
Aalborg, Denmark:</p>

<?php
$metar  = get_metar('EKYT');
$data   = process_metar($metar);
$temp_c = $data['temp_c'];
$temp_f = $data['temp_f'];
echo "<p>The temperature is $temp_c degrees Celsius ($temp_f degrees Fahrenheit).</p>";
?>

<p>But you'll probably want the nice large examples you saw on the
previous pages? To make the examples above I've made a function called
<code>pretty_print_metar()</code>. You use it like this:</p>

<code><font color="#000000">
<font color="#0000BB">&lt;?php<br>$metar&nbsp;</font><font color="#007700">=&nbsp;</font><font color="#0000BB">get_metar</font><font color="#007700">(</font><font color="#DD0000">'EKYT'</font><font color="#007700">);<br>include(</font><font color="#DD0000">'locale_en.inc'</font><font color="#007700">);<br></font><font color="#0000BB">pretty_print_metar</font><font color="#007700">(</font><font color="#0000BB">$metar</font><font color="#007700">,&nbsp;</font><font color="#DD0000">'Aalborg,&nbsp;Denmark'</font><font color="#007700">);<br></font><font color="#0000BB">?&gt;</font>
</font>
</code>

<p>This will give you an English text with the current weather in
Aalborg, Denmark:</p>

<?php
$metar = get_metar('EKYT');
pretty_print_metar($metar, 'Aalborg, Denmark');
?>

<?php
require('../../include/footer.php');
?>

--- NEW FILE ---
<?php
/* 	$Id: usingwap.php,v 1.1 2002/03/18 17:36:40 gimpster Exp $	 */
require('../../include/header.php');
require('../../phpweather-1.x/phpweather.inc');
require('../../phpweather-1.x/locale_en.inc');
?>

<p>PHP Weather can also be used to serve current weather information
to WAP-enables mobile phones. To do this, just put the file
<code>wap.php</code> in the same directory as
<code>phpweather.inc</code> and then point your WAP-browser on your
mobile phone to the page. It should then show you the current weather
in Aalborg, Denmark.</p> <p>The format used in the
<code>wap.php</code>-page is a smaller and more compact format than
the one shown on this page. It looks like this:</p>

<pre><? pretty_print_metar_wap(get_metar('EKYT'), 'Aalborg'); ?></pre>

<p>The code is almost the same as when you make a normal page, you
just use the <code>pretty_print_metar_wap()</code>-function
instead:</p>

<code><font color="#000000">
<font color="#0000BB">&lt;?<br></font><font color="#007700">include(</font><font color="#DD0000">'phpweather.inc'</font><font color="#007700">);<br></font><font color="#0000BB">pretty_print_metar_wap</font><font color="#007700">(</font><font color="#0000BB">get_metar</font><font color="#007700">(</font><font color="#DD0000">'EKYT'</font><font color="#007700">),&nbsp;</font><font color="#DD0000">'Aalborg'</font><font color="#007700">);<br></font><font color="#0000BB">?&gt;<br></font>
</font>
</code>

<?php
require('../../include/footer.php');
?>

CVS: web style.css,NONE,1.1 links.php,NONE,1.1

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web
In directory usw-pr-cvs1:/tmp/cvs-serv21106

Added Files:
	style.css links.php 
Log Message:
More files for the website.


--- NEW FILE ---
/* Stylesheet made for www.gimpster.com */
/*	$Id: style.css,v 1.1 2002/03/18 17:36:04 gimpster Exp $	*/

body, p, a, td, th {
  font-family: verdana, arial, helvetica, sans-serif;
}

body {
  background: white;
  color: black;
}

dt {
  font-weight: bold;
  clear: both;
  padding-top: 10px;
}


a {
  text-decoration: none;
}

a:hover {
  text-decoration: underline;
  color: red;
}


p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
}

p.nav-parents { 
  font-size: 110%;
  text-align: center;
}

p.nav-siblings { 
  text-align: center;
}

/*
p.head {
  font-weight: bold;
}

p.section {
  margin-top: 1em;
  font-size: 150%;
  font-weight: bold;
}

p.subsection {
  font-size: 120%;
  font-weight: bold;
}

p.subsubsection {
  font-size: 110%;
  font-style: italic;
}

*/

p.footer {
  margin-top: 0;
  margin-bottom: 0;
  font-size: 80%;
  text-align: center;
}

td {
  vertical-align: top;
}

--- NEW FILE ---
<?php
/* 	$Id: links.php,v 1.1 2002/03/18 17:36:04 gimpster Exp $	 */
require('include/header.php');
?>

<p>These webpages have information regarding the parsing of METARs and
other subjects related to PHP Weather.</p>

<dl>
  
  <dt><a href="http://tgsv5.nws.noaa.gov/oso/oso1/oso12/fmh1/fmh1ch12.htm">Federal Meteorological Handbook No. 1, Chapter 12 Coding</a></dt>
  
  <dd><p>
    This is the document I've used as a reference while writing
    <a href="http://www.sourceforge.net/projects/phpweather/">PHP
    Weather</a>. It conforms with the WMO Manual on Codes No. 306. If you
    want to learn how to read the raw coded messages, or want to make a
    parser yourself, you should read this. It might seam a bit complicated
    at first sight, but when you've read it a couple of times things start
    to clear up :-)
  </p></dd>

  <dt><a href="http://www.wcnet.org/~jzawodn/perl/Geo-METAR/">Geo::METAR</a></dt>
  
  <dd><p>
    Geo::METAR is written by <a
    href="mailto:Je...@Za...">Jeremy D. Zawodny</a>, and is the
    <a href="http://www.perl.com">Perl</a> module that I used as a
    template for PHP Weather. I searched the web for a PHP-script that
    could translate a METAR, but instead I found Geo::METAR. When
    looking at the Perl-code I realised that I could just translate it
    into PHP-code without any problems. So I did, and the result is
    PHP Weather.
  </p></dd>

  <dt><a href="http://weather.noaa.gov/weather/metar.shtml">METAR Data Access</a></dt>
  
  <dd><p>
    Here you'll find the raw METAR data. In PHP Weather I download the
    reports via HTTP from <a
    href="http://weather.noaa.gov/pub/data/observations/metar/stations/">http://weather.noaa.gov/pub/data/observations/metar/stations/</a>.</p>
    
    <p>To use any of these services you have to know the
    four-character ICAO Location Indicator for the station. The easiest
    way to find the Location Indicator is to go to <a
    href="http://weather.noaa.gov/weather/ccworld.html">this page</a>.
    There you'll be able to choose a country, and the choose a station
    from a list of stations is that country.
  </p></dd>

  <dt><a href="http://rtccom.net/~thammer/phorecast-0.1.tgz">Phorecast</a></dt>
  
  <dd><p>
    <a href="mailto:th...@rt...">Todd Hammer</a> has made a
    script, that parsed forecasts for the US. It can be used with or
    without PHP Weather, but I think it complements is fine - assuming
    you live in the US.
  </p></dd>

  <dt><a href="http://oreo.somewhere.net/">O.R.E.O Weather</a></dt>

  <dd><p>
    <a href="http://oreo.somewhere.net/">O.R.E.O Weather</a> is a
    program written in Toolbook, a language like Visual Basic, that
    uses PHP Weather to display the current weather.
  </p></dd>

</dl>

<?php
require('include/footer.php');
?>

CVS: web/docs/2.x - New directory

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/docs/2.x
In directory usw-pr-cvs1:/tmp/cvs-serv20672/2.x

Log Message:
Directory /cvsroot/phpweather/web/docs/2.x added to the repository

CVS: web/docs/1.x - New directory

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/docs/1.x
In directory usw-pr-cvs1:/tmp/cvs-serv20672/1.x

Log Message:
Directory /cvsroot/phpweather/web/docs/1.x added to the repository

CVS: web/images - New directory

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/images
In directory usw-pr-cvs1:/tmp/cvs-serv20507/images

Log Message:
Directory /cvsroot/phpweather/web/images added to the repository

CVS: web/docs - New directory

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/docs
In directory usw-pr-cvs1:/tmp/cvs-serv20507/docs

Log Message:
Directory /cvsroot/phpweather/web/docs added to the repository

CVS: phpweather/db/files .cvsignore,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather/db/files
In directory usw-pr-cvs1:/tmp/cvs-serv19370

Modified Files:
	.cvsignore 
Log Message:
It's these files that should be ignored...


Index: .cvsignore
===================================================================
RCS file: /cvsroot/phpweather/phpweather/db/files/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	18 Mar 2002 16:55:45 -0000	1.1
+++ .cvsignore	18 Mar 2002 17:32:11 -0000	1.2
@@ -1,3 +1,3 @@
-countries.dba.db
-metars.dba.db
-stations.dba.db
+countries.dba
+metars.dba
+stations.dba

CVS: web support.php,1.13,1.14

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web
In directory usw-pr-cvs1:/tmp/cvs-serv18451

Modified Files:
	support.php 
Log Message:
Updated!


Index: support.php
===================================================================
RCS file: /cvsroot/phpweather/web/support.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- support.php	6 Mar 2002 22:31:15 -0000	1.13
+++ support.php	18 Mar 2002 17:30:14 -0000	1.14
@@ -1,21 +1,53 @@
-<html>
-  <head>
-    <title>Support for PHP Weather</title>
-  </head>
-  <body>
-  <a href="http://sourceforge.net/projects/phpweather/"><img
-  src="http://sourceforge.net/sflogo.php?group_id=23245" width="88"
-  height="31" border="0" alt="SourceForge Logo" align="right"></a>
-
-  <h1>Support for PHP Weather</h1>
-
-  <p>The main source of support on PHP Weather is the maillinglist at
-  <a href="http://www.sourceforge.net/">SourceForge</a>. You'll find
-  it here: <a href="http://sourceforge.net/mail/?group_id=23245">PHP
-  Weather Mailing Lists</a>.</p>
+<?php require('include/header.php'); ?>
 
-  <p>Please note, that you have to subscribe to the lists, <i>before</i> you
-  can post to them. This is to prevent SPAM on the lists.</p>
+<p>You should start by reading the <a
+href="docs/index.php">documentaion</a> if you're having problems with
+PHP Weather. After you've done that, then try the mailinglist at <a
+href="http://www.sourceforge.net/">SourceForge</a>. There's two
+maillinglists in use at <a
+href="http://www.sourceforge.net/">SourceForge</a>, although you can
+only post to one of them:</p>
 
-  </body>
-</html>
+<dl>
+
+  <dt><a href="http://lists.sourceforge.net/mailman/listinfo/phpweather-devel">phpweather-devel Subscribe/Unsubscribe/Preferences</a></dt>
+  <dt><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=2219">phpweather-devel Archives</a></dt>
+    
+  <dd>
+
+    <p>This list is use for all sorts of questions and discussion
+    about PHP Weather. People can come here asking for help (for
+    problems with both version 1.x and 2.x) or we can discuss the
+    development of PHP Weather.</p>
+
+    <p>The list is generally a low-volume list, but this depends on
+    how much work we're doing on PHP Weather. There has been periods
+    with only a single mail or so each month, and there are periods
+    with a couple mails each day.</p>
+    
+  </dd>
+
+  <dt><a href="http://lists.sourceforge.net/mailman/listinfo/phpweather-checkins">phpweather-checkins Subscribe/Unsubscribe/Preferences</a></dt>
+  <dt><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=2210">phpweather-checkins Archives</a></dt>
+
+  <dd>
+
+    <p>If you're using the CVS version of PHP Weather, then you
+    should subscribe to this list. Everytime the sources are changed
+    in CVS, a mail is sent to the list with the differences between
+    the new and old version of the changed files.</p>
+
+    <p>The amount of mail that flows through this list is (naturally)
+    very dependent on the amount of work being done on PHP Weather.
+    But you should probably prepare for a couple of mails a month, and
+    several mails each day when we're really busy.</p>
+
+  </dd>
+
+</dl>
+  
+<p>Please note, that you have to subscribe to the lists, <i>before</i>
+you can post to them. You're only allowed to post to the lists from a
+subscribed address - this is to prevent SPAM on the lists.</p>
+
+<?php require('include/footer.php'); ?>

CVS: web/include header.php,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/include
In directory usw-pr-cvs1:/tmp/cvs-serv10422/include

Modified Files:
	header.php 
Log Message:
This should help.


Index: header.php
===================================================================
RCS file: /cvsroot/phpweather/web/include/header.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- header.php	18 Mar 2002 16:51:37 -0000	1.1
+++ header.php	18 Mar 2002 17:06:44 -0000	1.2
@@ -6,7 +6,7 @@
   define('ROOT', '');
 }
 
-include('navigation.php');
+include('include/navigation.php');
 
 ?>
 <html>

CVS: web index.php,1.7,1.8

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web
In directory usw-pr-cvs1:/tmp/cvs-serv10422

Modified Files:
	index.php 
Log Message:
This should help.


Index: index.php
===================================================================
RCS file: /cvsroot/phpweather/web/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- index.php	18 Mar 2002 16:52:28 -0000	1.7
+++ index.php	18 Mar 2002 17:06:44 -0000	1.8
@@ -12,8 +12,7 @@
   <p>PHP Weather helps you do this on your webpages:</p>
 
 <?php
-$weather = new phpweather(array('db_handler' => 'ndbm',
-                                'db_type' => 'dba'));
+$weather = new phpweather(array());
 $text = new pw_text_en($weather, array('mark_begin' => '<font color="blue">',
                                        'mark_end'   => '</font>'));
 $images = new pw_images($weather, array('icons_path' => 'phpweather/icons/'));

CVS: phpweather/db pw_db_dba.php,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather/db
In directory usw-pr-cvs1:/tmp/cvs-serv6340

Modified Files:
	pw_db_dba.php 
Log Message:
Added a suffix on the filenames so it doesn't use the same name at the
default null database.


Index: pw_db_dba.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/db/pw_db_dba.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_db_dba.php	7 Mar 2002 09:40:38 -0000	1.1
+++ pw_db_dba.php	18 Mar 2002 16:57:54 -0000	1.2
@@ -92,33 +92,33 @@
     if (!$this->properties['db_pconnect']) {
       $this->is_connected = $this->link_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_metars'],
+		 $this->properties['db_metars'] . '.dba',
 		 'w',
 		 $this->properties['db_handler']);
       $this->link_stations_id = 
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_stations'],
+		 $this->properties['db_stations'] . '.dba',
 		 'r',
 		 $this->properties['db_handler']);
       $this->link_countries_id = 
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_countries'],
+		 $this->properties['db_countries'] . '.dba',
 		 'r',
 		 $this->properties['db_handler']);
     } else {
       $this->is_connected = $this->link_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_metars'],
+		  $this->properties['db_metars'] . '.dba',
 		  'w',
 		  $this->properties['db_handler']);
       $this->link_stations_id = 
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_stations'],
+		  $this->properties['db_stations'] . '.dba',
 		  'r',
 		  $this->properties['db_handler']);
       $this->link_countries_id = 
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_countries'],
+		  $this->properties['db_countries'] . '.dba',
 		  'r',
 		  $this->properties['db_handler']);
     }
@@ -221,33 +221,33 @@
     if (!$this->properties['db_pconnect']) {
       $this->is_connected = $this->link_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_metars'],
+		 $this->properties['db_metars'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
       $this->link_stations_id = 
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_stations'],
+		 $this->properties['db_stations'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
       $this->link_countries_id = 
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
-		 $this->properties['db_countries'],
+		 $this->properties['db_countries'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
     } else {
       $this->is_connected = $this->link_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_metars'],
+		  $this->properties['db_metars'] . '.dba',
 		  'n',
 		  $this->properties['db_handler']);
       $this->link_stations_id = 
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_stations'],
+		  $this->properties['db_stations'] . '.dba',
 		  'n',
 		  $this->properties['db_handler']);
       $this->link_countries_id = 
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
-		  $this->properties['db_countries'],
+		  $this->properties['db_countries'] . '.dba',
 		  'n',
 		  $this->properties['db_handler']);
     }

CVS: phpweather/db/files .cvsignore,NONE,1.1

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather/db/files
In directory usw-pr-cvs1:/tmp/cvs-serv5738

Added Files:
	.cvsignore 
Log Message:
These files are created by the dba backend and should be ignored by CVS.


--- NEW FILE ---
countries.dba.db
metars.dba.db
stations.dba.db

CVS: web index.php,1.6,1.7

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web
In directory usw-pr-cvs1:/tmp/cvs-serv4601

Modified Files:
	index.php 
Log Message:
New fancy frontpage for our website.


Index: index.php
===================================================================
RCS file: /cvsroot/phpweather/web/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- index.php	4 Mar 2002 22:20:11 -0000	1.6
+++ index.php	18 Mar 2002 16:52:28 -0000	1.7
@@ -1,22 +1,132 @@
-<html>
-  <head>
-    <title>PHP Weather</title>
-  </head>
-  <body>
-  <a href="http://sourceforge.net/projects/phpweather/"><img
-  src="http://sourceforge.net/sflogo.php?group_id=23245" width="88"
-  height="31" border="0" alt="SourceForge Logo" align="right"></a>
-
-  <h1>PHP Weather</h1>
+<?php
+require_once('include/header.php');
+require_once('phpweather/phpweather.php');
+require_once('phpweather/output/pw_text_en.php');
+require_once('phpweather/output/pw_images.php');
+require_once('phpweather/pw_utilities.php');
+?>
 
   <p>This is the homepage of PHP Weather at <a
-  href="http://www.sourceforge.net/">SourceForge</a>. There isn't very
-  much here at the moment, but that should (hopefully) change over
-  time...</p>
-
-  <p>For the moment, you should see <a
-  href="http://www.sourceforge.net/projects/phpweather/">The
-  SourceForge Page</a> if you're interested in downloading files.</p>
+  href="http://www.sourceforge.net/">SourceForge</a>. You should go <a href="http://sourceforge.net/project/showfiles.php?group_id=23245">here to download</a> files.</p>
+
+  <p>PHP Weather helps you do this on your webpages:</p>
+
+<?php
+$weather = new phpweather(array('db_handler' => 'ndbm',
+                                'db_type' => 'dba'));
+$text = new pw_text_en($weather, array('mark_begin' => '<font color="blue">',
+                                       'mark_end'   => '</font>'));
+$images = new pw_images($weather, array('icons_path' => 'phpweather/icons/'));
+
+echo '<p>Current weather in ' . $weather->get_location() . ': ' . 
+  '<img src="' . $images->get_sky_image() .
+  '" height="50" width="80" border="1"> ' .
+  '<img src="' . $images->get_winddir_image() .
+  '" height="40" width="40" border="1"> ' .
+  '<img src="' . $images->get_temp_image() .
+  '" height="50" width="20" border="1">';
+
+echo ". A textual report looks like this:</p>\n";
+
+$text->print_pretty();
+
+echo "<p>Now try it yourself:</p>\n";
+
+if (empty($action)) {
+  /* No action - we display a form from which the user can select a
+     country. */
+  
+  echo '
+<p>
+<form action="index.php" method="get">
+<input type="hidden" name="action" value="show_stations">
+';
+
+  make_countries_select($weather, '');
+
+  echo '
+<input type="submit">
+</form>
+</p>
+';
+
+} elseif ($action == 'show_stations' && !empty($cc)) {
+  /* A country has just been selected - we make a form with all
+     stations in that country. */
+  
+  echo '
+<p>
+<form action="index.php" method="get">
+<input type="hidden" name="action" value="show_weather">
+';
+
+  if (empty($icao)) $icao = '';
+  if (empty($language)) $language = '';
+  
+
+  make_countries_select($weather, $cc);
+  make_stations_select($weather, $cc, $icao);
+  make_languages_select($weather, $language);
+
+  echo '
+<input type="submit">
+</form>
+</p>
+';
+
+} elseif ($action == 'show_weather' && !empty($language)) {
+  /* A station has just been selected - we print the weather. */
+  echo '
+<p>
+<form action="index.php" method="get">
+<input type="hidden" name="action" value="show_weather">
+';
+    
+  make_countries_select($weather, $cc);
+  make_stations_select($weather, $cc, $icao);
+  make_languages_select($weather, $language);
+
+  echo '
+<input type="submit">
+</form>
+</p>
+';
+
+  if ($cc == $old_cc) {
+    /* We should only display the current weather is the country isn't
+       changed */
+    $weather->set_icao($icao);
+    include_once(PHPWEATHER_BASE_DIR . "/output/pw_text_$language.php");
+    $type = 'pw_text_' . $language;
+    $text = new $type($weather, array('mark_begin' => '<font color="green">',
+                                      'mark_end'   => '</font>'));
+    
+    echo "<p>This is the current weather in " .
+      $weather->get_location() . ":</p>\n";
+    
+    $text->print_pretty();
+
+    echo "<p>The matching icons are:</p>\n";
+
+    include_once(PHPWEATHER_BASE_DIR . "/output/pw_images.php");
+
+    $icons = new pw_images($weather, array('icons_path' => 'phpweather/icons/'));
+
+    echo "<blockquote>\n";
+    echo '<img src="' . $icons->get_sky_image() .
+      '" height="50" width="80" border="1"> ';
+    echo '<img src="' . $icons->get_winddir_image() .
+      '" height="40" width="40" border="1"> ';
+    echo '<img src="' . $icons->get_temp_image() .
+      '" height="50" width="20" border="1">';
+    echo "</blockquote>\n";
+
+
+    echo "<p>The raw METAR is <code>" . $weather->get_metar() . "</code></p>\n";
+    
+  }
+}
+
+require_once('include/footer.php');
 
-  </body>
-</html>
+?>

CVS: web/include footer.php,NONE,1.1 header.php,NONE,1.1 navigation.p...

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/include
In directory usw-pr-cvs1:/tmp/cvs-serv4308

Added Files:
	footer.php header.php navigation.php 
Log Message:
Header and footer-files for the website.


--- NEW FILE ---

<hr>

<a href="http://sourceforge.net/projects/phpweather/"><img
src="http://sourceforge.net/sflogo.php?group_id=23245" width="88"
height="31" border="0" alt="SourceForge Logo" align="right"></a>

<p>This page was last modified on <? echo date('F \t\h\e jS, Y', getlastmod()) ?>.</p>


  </body>
</html>

--- NEW FILE ---
<?php

if ($SERVER_NAME == 'gimpster.bolignet-aarhus.dk') {
  define('ROOT', '/php/phpweather-web');
} else {
  define('ROOT', '');
}

include('navigation.php');

?>
<html>
  <head>
    <title>PHP Weather: <?php echo $pages[$PHP_SELF]['title'] ?></title>
    <link rel="stylesheet" type="text/css" href="<?php echo ROOT ?>/style.css">
    <!-- <link rel="shortcut icon" href="/favicon.ico"> -->
  </head>
  <body>

<?php /* Make the links. */
print_parents(substr($PHP_SELF, strlen(ROOT)));
print_siblings(substr($PHP_SELF, strlen(ROOT)));
echo "<hr>\n";
print_greeting(substr($PHP_SELF, strlen(ROOT)));
?>


--- NEW FILE ---
<?php

$pages['/index.php'] =
  array('title'    => 'PHP Weather',
        'greeting' => 'Welcome to PHP Weather',
        'children' => array(//'/downloads.php',
                            '/docs/index.php',
                            '/support.php',
                            '/links.php'));
/*
$pages['/downloads.php'] =
  array('title'    => 'Downloads',
        'parent'   => '/index.php');
*/

$pages['/docs/index.php'] =
  array('title'    => 'Documentation', 
        'greeting' => 'Documentaion for PHP Weather',
        'parent'   => '/index.php',
        'children' => array('/docs/1.x/index.php',
                            '/docs/2.x/index.php'));

$pages['/docs/1.x/index.php'] =
  array('title'    => 'Version 1.x',
        'parent'   => '/docs/index.php',
        'children' => array('/docs/1.x/demo.php',
                            '/docs/1.x/using.php',
                            '/docs/1.x/dbcaching.php',
                            '/docs/1.x/translation.php',
                            '/docs/1.x/usingwap.php'));

$pages['/docs/1.x/demo.php'] =
  array('parent'   => '/docs/1.x/index.php',
        'title'    => 'Demo',
        'greeting' => 'Demonstration');

$pages['/docs/1.x/using.php'] =
  array('parent' => '/docs/1.x/index.php',
        'title'  => 'Using PHP Weather');

$pages['/docs/1.x/usingwap.php'] =
  array('parent'   => '/docs/1.x/index.php',
        'title'    => 'WAP',
        'greeting' => 'How to WAP?');

$pages['/docs/1.x/dbcaching.php'] =
  array('parent'   => '/docs/1.x/index.php',
        'title'    => 'Caching',
        'greeting' => 'Caching the METARs');

$pages['/docs/1.x/translation.php'] =
  array('parent' => '/docs/1.x/index.php',
        'title'  => 'Translation');

$pages['/docs/1.x/support.php'] =
  array('parent'   => '/docs/1.x/index.php',
        'title'    => 'Support',
        'greeting' => 'Getting Support');

$pages['/docs/1.x/download.php'] =
  array('parent' => '/docs/1.x/index.php',
        'title'  => 'Download');

$pages['/docs/1.x/links.php'] =
  array('parent' => '/docs/1.x/index.php',
        'title'  => 'Links');

$pages['/docs/2.x/index.php'] =
  array('title'  => 'Version 2.x',
        'parent' => '/docs/index.php');

$pages['/support.php'] =
  array('title'    => 'Support',
        'greeting' => 'Getting Support for PHP Weather',
        'parent'   => '/index.php');

$pages['/links.php'] =
  array('title'    => 'Links',
        'greeting' => 'Links to Related Information',
        'parent'   => '/index.php');


function find_parents($node) {
  global $pages;
  if (!empty($pages[$node]['parent'])) {
    $parents = find_parents($pages[$node]['parent']);
  }
  $parents[$node] = $pages[$node]['title'];
  return $parents;
}

function print_parents($start_node) {
  global $pages;
  echo '<p class="nav-parents">The Internet';
  $parents = find_parents($start_node, $pages);
  $count = count($parents);
  if (empty($pages[$start_node]['children'])) {
    $count--;
  }
  for ($i = 0; $i < $count; $i++) {
    list($node, $title) = each($parents);
    if ($node == $start_node) {
      echo " <b>-&gt;</b> <b>$title</b>";
    } else {
      echo ' <b>-&gt;</b> <a href="' . ROOT . $node . "\">$title</a>";
    }
  }
  echo ":</p>\n";
}

function print_siblings($start_node) {
  global $pages;
  echo '<p class="nav-siblings">';
  if (empty($pages[$start_node]['children'])) {
    /* No children. */
    $parent = $pages[$pages[$start_node]['parent']];
    $pipe = '';

    foreach($parent['children'] as $node) {
      if ($node == $start_node) {
        if ($pipe != '') { // $pipe == '' at the beginning.
          $pipe = ' <b>/</b> ';
        }

	echo $pipe . '<b>' . $pages[$node]['title'] . '</b>';
        $pipe = ' <b>\\</b> '; // We put a \ after the current node.
      } else {
	echo $pipe . '<a href="' . ROOT . $node . '">' .
          $pages[$node]['title'] . '</a>';
        $pipe = ' <b>|</b> '; // A normal | after other nodes.
      }
    }
  } else {
    /* Children */
    list($i, $child) = each($pages[$start_node]['children']);
    echo '<a href="' . ROOT . $child . '">' . $pages[$child]['title'] . '</a>';
    while (list($i, $child) = each($pages[$start_node]['children'])) {
      echo ' <b>|</b> <a href="' . ROOT . $child . '">' .
        $pages[$child]['title'] . '</a>';
    }
  }
  echo "</p>\n";
}

function print_greeting($node) {
  global $pages;

  if (empty($pages[$node]['greeting'])) {
    echo '<h1>' . $pages[$node]['title'] . "</h1>\n";
  } else {
    echo '<h1>' . $pages[$node]['greeting'] . "</h1>\n";
  }    
}

?>

CVS: web/include - New directory

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web/include
In directory usw-pr-cvs1:/tmp/cvs-serv4086/include

Log Message:
Directory /cvsroot/phpweather/web/include added to the repository

CVS: web .cvsignore,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/web
In directory usw-pr-cvs1:/tmp/cvs-serv31419

Modified Files:
	.cvsignore 
Log Message:
The directories phpweather and phpweather-1.x are checked out from CVS
seperately once in a while...


Index: .cvsignore
===================================================================
RCS file: /cvsroot/phpweather/web/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	5 Mar 2002 10:36:05 -0000	1.1
+++ .cvsignore	18 Mar 2002 16:37:29 -0000	1.2
@@ -1,2 +1,2 @@
-downloads
-docs
+phpweather
+phpweather-1.x 

CVS: phpweather/output pw_images.php,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather/output
In directory usw-pr-cvs1:/tmp/cvs-serv24830/output

Modified Files:
	pw_images.php 
Log Message:
There has to be a way to specify the path of the icons relative to the
document that uses pw_images to display them.


Index: pw_images.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_images.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_images.php	17 Mar 2002 13:39:04 -0000	1.1
+++ pw_images.php	18 Mar 2002 16:19:59 -0000	1.2
@@ -347,9 +347,11 @@
     // The correct image can be selected from the array.
 
     if (($night == 1) || ($this->itime == 'nite')) {
-      return 'icons/' . $this->n_images[$phenomena_group][$maxcoverage];
+      return $this->properties['icons_path'] .
+        $this->n_images[$phenomena_group][$maxcoverage];
     } else { 
-      return 'icons/' . $this->images[$phenomena_group][$maxcoverage];
+      return $this->properties['icons_path'] .
+        $this->images[$phenomena_group][$maxcoverage];
     }
   
   }
@@ -372,14 +374,15 @@
     if (!empty($processed_metar_data['wind'])) {
       $wind = $processed_metar_data['wind'];
       if ($wind['deg'] == 'VRB') {
-        return 'icons/' . $this->wind_vrb_image;
+        return $this->properties['icons_path'] . $this->wind_vrb_image;
       } elseif (($wind['deg'] == 0) && ($wind['knots'] == 0)) {
-        return 'icons/' . $this->wind_nodir_image;
+        return $this->properties['icons_path'] . $this->wind_nodir_image;
       } else {
-        return 'icons/' . $this->wind_dir_images[round($wind['deg']/22.5)];
+        return $this->properties['icons_path'] .
+          $this->wind_dir_images[round($wind['deg']/22.5)];
       }
     } else {
-      return 'icons/' . $this->wind_nodata_image;
+      return $this->properties['icons_path'] . $this->wind_nodata_image;
     }
   }
   // ------------------------------------------------------------------------
@@ -400,12 +403,12 @@
 
     if (!empty($processed_metar_data['temperature'])) {
       if ($processed_metar_data['temperature']['temp_c'] > 0) {
-        return 'icons/' . $this->temp_high_image;
+        return $this->properties['icons_path'] . $this->temp_high_image;
       } else {
-        return 'icons/' . $this->temp_low_image;
+        return $this->properties['icons_path'] . $this->temp_low_image;
       }
     } else {
-      return 'icons/' . $this->temp_nodata_image;
+      return $this->properties['icons_path'] . $this->temp_nodata_image;
     }
   }
   // ------------------------------------------------------------------------

CVS: phpweather defaults-dist.php,1.10,1.11

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv24830

Modified Files:
	defaults-dist.php 
Log Message:
There has to be a way to specify the path of the icons relative to the
document that uses pw_images to display them.


Index: defaults-dist.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/defaults-dist.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- defaults-dist.php	17 Mar 2002 14:06:11 -0000	1.10
+++ defaults-dist.php	18 Mar 2002 16:19:58 -0000	1.11
@@ -41,6 +41,8 @@
 
 $this->properties['orientation']   = 'horizontal';  /* pw_text.php */
 
+$this->properties['icons_path']    = 'icons/';      /* pw_images.php */
+
 // hack around PHP bug - the offset to add to a time reported
 $this->properties['offset']        = 0;
 

CVS: phpweather/output pw_text.php,1.1,1.2 pw_text_en.php,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather/output
In directory usw-pr-cvs1:/tmp/cvs-serv23291

Modified Files:
	pw_text.php pw_text_en.php 
Log Message:
Let's just wait a little with this table-thing...


Index: pw_text.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_text.php	17 Mar 2002 13:39:04 -0000	1.1
+++ pw_text.php	18 Mar 2002 16:14:31 -0000	1.2
@@ -1101,6 +1101,8 @@
   function print_table() {
     // We use our own weather-object.
     $data = $this->weather->decode_metar();
+    
+    /* This doesn't work yet...
 
     $location = $data['location'];
 
@@ -1114,8 +1116,6 @@
 
     $humidity = $this->print_pretty_rel_humidity($data['rel_humidity']);
     
-    /* The table-heading ought to be translated. */
-
     if ($this->properties['orientation'] == 'vertical') {
  
     } else {
@@ -1140,6 +1140,9 @@
 ";
 
     }
+
+  */
+
   }
 }
 

Index: pw_text_en.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text_en.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_text_en.php	17 Mar 2002 13:39:04 -0000	1.1
+++ pw_text_en.php	18 Mar 2002 16:14:31 -0000	1.2
@@ -165,12 +165,6 @@
     $this->strings['runway_visibility']        = 'The visibility was ';
     $this->strings['runway_for_runway']        = ' for runway ';
 
-    $this->strings['wind'] = 'Wind';
-    $this->strings['date'] = 'Date';
-    $this->strings['pressure'] = 'Air Pressure';
-    $this->strings['humidity'] = 'Humidity';
-    $this->strings['location'] = 'Location';
-
     /* We run the parent constructor */
     $this->pw_text($weather, $input);
   }

CVS: phpweather pw_utilities.php,NONE,1.1

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv22915

Added Files:
	pw_utilities.php 
Log Message:
I think people would appreciate these functions.


--- NEW FILE ---
<?php

/* Miscellaneous functions that can help you build an interactive site
 * with PHP Weather. */

function make_countries_select($weather, $old_cc) {
  echo'
<select name="cc">
';
   
  $countries = $weather->db->get_countries();
  while (list($cc, $country) = each($countries)) {
    if ($cc == $old_cc) {
      echo "<option value=\"$cc\" selected>$country</option>\n";
    } else {
      echo "<option value=\"$cc\">$country</option>\n";
    }
  }      
  echo "</select>\n";
  echo '<input type="hidden" name="old_cc" value="' . $old_cc . '">';

}


function make_stations_select($weather, $cc, $old_icao) {
  
  $country = '';
  $icaos = $weather->db->get_icaos($cc, $country);
  
  echo '
<select name="icao">
';

  while (list($icao, $name) = each($icaos)) {
    if ($icao == $old_icao) {
      echo "<option value=\"$icao\" selected>$name</option>\n";
    } else {
      echo "<option value=\"$icao\">$name</option>\n";
    }
  }
  echo "</select>\n";
  echo '<input type="hidden" name="old_icao" value="' . $old_icao . '">';
}


function make_languages_select($weather, $old_language) {

  echo '
<select name="language">
';
  $languages = $weather->get_languages('text');

  while (list($lc, $language) = each($languages)) {
    if ($lc == $old_language) {
      echo "<option value=\"$lc\" selected>$language</option>\n";
    } else {
      echo "<option value=\"$lc\">$language</option>\n";
    }
  }
  echo "</select>\n";
  echo '<input type="hidden" name="old_language" value="' . $old_language . '">';
}

?>

CVS: phpweather usermap,1.3,1.4 ChangeLog,1.5,1.6

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv29941

Modified Files:
	usermap ChangeLog 
Log Message:
This is a pretty good compromise, I think...


Index: usermap
===================================================================
RCS file: /cvsroot/phpweather/phpweather/usermap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- usermap	17 Mar 2002 14:24:34 -0000	1.3
+++ usermap	18 Mar 2002 13:46:56 -0000	1.4
@@ -1,4 +1,3 @@
 gimpster:Martin Geisler  <gim...@gi...>
-misibacsi:Mihaly Gyulai  <gy...@my...>
+misibacsi:Mihaly Gyulai  gyulai.freeyellow.com/
 iridium:Max Hammond  <ma...@fl...>
-

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpweather/phpweather/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ChangeLog	17 Mar 2002 14:13:18 -0000	1.5
+++ ChangeLog	18 Mar 2002 13:46:56 -0000	1.6
@@ -1,3 +1,39 @@
+2002-03-17 21:57  Martin Geisler  <gim...@gi...>
+
+	* AUTHORS:
+	
+	Added Gyulai Mihály to the list of authors - about time some would
+	say :-)
+
+2002-03-17 14:52  Max Hammond  <ma...@fl...>
+
+	* index.php:
+	
+	Correcting path to images output
+
+2002-03-17 14:24  Max Hammond  <ma...@fl...>
+
+	* usermap:
+	
+	Updated my email address to what I actually use :)
+
+2002-03-17 14:13  Martin Geisler  <gim...@gi...>
+
+	* ChangeLog, usermap:
+	
+	Updated ChangeLog and added iridium to the usermappings.
+	
+	By the way, what do people think about having their email-addresses
+	written all over the place without any SPAM-protection?
+	
+	I have no problem with this myself, as my email-address is SPAM-
+	protected by a program called TMDA, but it just occurred to me that
+	some of you might have tied to keep your address 'secret' and then
+	I just write it all over the place...
+	
+	In short: feel free to edit usermap and AUTHORS if you want the
+	info to be different than what I've made.
+
 2002-03-17 14:06  Martin Geisler  <gim...@gi...>
 
 	* defaults-dist.php:
@@ -58,13 +94,13 @@
 	use the question-mark for the temperature, but unfortunately that's
 	already used with the wind...
 
-2002-03-15 12:01  Max Hammond <ir...@us...>
+2002-03-15 12:01  Max Hammond  <ma...@fl...>
 
 	* data_retrieval.php:
 	
 	Oops
 
-2002-03-15 11:37  Max Hammond <ir...@us...>
+2002-03-15 11:37  Max Hammond  <ma...@fl...>
 
 	* icons/: 0cloud.gif, 0cloud_fog.gif, 1cloud_fog.gif,
 	1cloud_heavyrain.gif, 1cloud_lightrain.gif, 1cloud_modrain.gif,
@@ -92,7 +128,7 @@
 	
 	added icons
 
-2002-03-15 11:22  Max Hammond <ir...@us...>
+2002-03-15 11:22  Max Hammond  <ma...@fl...>
 
 	* data_retrieval.php:
 	
@@ -133,25 +169,25 @@
 	Applied patch from Carsten Klapp <car...@ma...> - thanks a
 	lot. I also did some reformatting on some of the comments.
 
-2001-12-20 19:11  Max Hammond <ir...@us...>
+2001-12-20 19:11  Max Hammond  <ma...@fl...>
 
 	* defaults-dist.php, metar_parser.php:
 	
 	Hacking around a bug in PHP function gmmktime
 
-2001-12-19 10:07  Max Hammond <ir...@us...>
+2001-12-19 10:07  Max Hammond  <ma...@fl...>
 
 	* metar_parser.php:
 	
 	oops. that should not have been committed...
 
-2001-12-19 10:04  Max Hammond <ir...@us...>
+2001-12-19 10:04  Max Hammond  <ma...@fl...>
 
 	* metar_parser.php, db/db_pgsql.php:
 	
 	Patched to make it work :)
 
-2001-12-19 09:12  Max Hammond <ir...@us...>
+2001-12-19 09:12  Max Hammond  <ma...@fl...>
 
 	* data_retrieval.php:
 	
@@ -198,7 +234,7 @@
 	Some servers only say '200' instead of '200 OK' when they're about
 	to send the document.
 
-2001-07-31 18:52  Mihaly Gyulai  <gy...@my...>
+2001-07-31 18:52  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* configurator.php, data_retrieval.php:
 	
@@ -335,7 +371,7 @@
 	
 	The compressed files shouldn't be in CVS.
 
-2001-07-13 18:02  Mihaly Gyulai  <gy...@my...>
+2001-07-13 18:02  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* phpweather.php:
 	
@@ -454,25 +490,25 @@
 	A shellscript, a phpscript and an inifile for PHP. Use these tools
 	to regenerate the documentation.
 
-2001-07-09 20:31  Mihaly Gyulai  <gy...@my...>
+2001-07-09 20:31  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* metar_parser.php:
 	
 	Rearranging comments and rounding numbers max. up to 5-6 digits.
 
-2001-07-09 19:30  Mihaly Gyulai  <gy...@my...>
+2001-07-09 19:30  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* stations.csv:
 	
 	Name correction for 'Jose Marti'.
 
-2001-07-09 19:09  Mihaly Gyulai  <gy...@my...>
+2001-07-09 19:09  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* db/files/stations.db:
 	
 	Name correction for 'Jose Marti'.
 
-2001-07-09 19:06  Mihaly Gyulai  <gy...@my...>
+2001-07-09 19:06  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* db/files/CU.php:
 	
@@ -496,14 +532,14 @@
 	
 	That's not needed anymore.
 
-2001-07-08 19:50  Mihaly Gyulai  <gy...@my...>
+2001-07-08 19:50  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* phpweather.php:
 	
 	
 	Rearranging comments.
 
-2001-07-08 19:43  Mihaly Gyulai  <gy...@my...>
+2001-07-08 19:43  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* INSTALL:
 	
@@ -518,35 +554,35 @@
 	I removed the lines regarding to 'Aalborg, Denmark' and 'Honolulu,
 	Hawaii', as they're not shown in the new version.
 
-2001-07-08 19:25  Mihaly Gyulai  <gy...@my...>
+2001-07-08 19:25  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* db_layer.php:
 	
 	
 	Rearranging comments.
 
-2001-07-08 19:21  Mihaly Gyulai  <gy...@my...>
+2001-07-08 19:21  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* data_retrieval.php:
 	
 	
 	Rearranging comments, removing typos...
 
-2001-07-08 18:57  Mihaly Gyulai  <gy...@my...>
+2001-07-08 18:57  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* base_object.php:
 	
 	
 	Rearranging comments, correcting typos...
 
-2001-07-08 18:47  Mihaly Gyulai  <gy...@my...>
+2001-07-08 18:47  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* README:
 	
 	
 	Rearranging comments, correcting typos...
 
-2001-07-08 18:04  Mihaly Gyulai  <gy...@my...>
+2001-07-08 18:04  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* stations.csv:
 	
@@ -554,7 +590,7 @@
 	Liverpool -> Liverpool / John Lennon (it was published in the news,
 	maybe it's not official yet)
 
-2001-07-08 17:26  Mihaly Gyulai  <gy...@my...>
+2001-07-08 17:26  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* db/files/GB.php:
 	
@@ -562,7 +598,7 @@
 	I modified the 'Liverpool Airport' to 'Liverpool / John Lennon
 	Airport' as they changed its name.
 
-2001-07-08 17:09  Mihaly Gyulai  <gy...@my...>
+2001-07-08 17:09  Mihaly Gyulai  gyulai.freeyellow.com/
 
 	* configurator.php, index.php:
 	

CVS: phpweather AUTHORS,1.1,1.2

[Martin G. <gim...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv2794

Modified Files:
	AUTHORS 
Log Message:
Added Gyulai Mihály to the list of authors - about time some would say :-)


Index: AUTHORS
===================================================================
RCS file: /cvsroot/phpweather/phpweather/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS	24 Mar 2001 15:48:21 -0000	1.1
+++ AUTHORS	17 Mar 2002 21:57:59 -0000	1.2
@@ -1,6 +1,6 @@
 Main author: Martin Geisler <gim...@gi...>
 
-A big thanks goes to all these persons, who have helped my make PHP
+A big thanks goes to all these persons, who have helped me make PHP
 Weather:
 
 Kristian Kristensen <zi...@zi...>
@@ -16,7 +16,7 @@
 
 Stefan Wiesendanger <ste...@ep...>
   For rewritting some large case- and switch-statements as a couple of
-  arrays. This speeds-up the parsing of the metars.
+  arrays. This speeds-up the parsing of the METARs.
 
 Mike <bvr...@ly...>
   He noticed that the pressures was all wrong. I though the unit used
@@ -64,4 +64,8 @@
   Made a German translation of PHP Weather.
 
 Carlo Gulin <ka...@ad...>
-  Translated PHP Weather into Italian.
\ No newline at end of file
+  Translated PHP Weather into Italian.
+
+Gyulai Mihály  http://gyulai.freeyellow.com/
+  Made the Hungarian translation for PHP Weather. He has also
+  corrected tons of spelling errors.

CVS: phpweather index.php,1.17,1.18

[Max H. <ir...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv7701

Modified Files:
	index.php 
Log Message:
Correcting path to images output

Index: index.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- index.php	17 Mar 2002 13:59:26 -0000	1.17
+++ index.php	17 Mar 2002 14:52:56 -0000	1.18
@@ -176,9 +176,9 @@
 
     echo "<p>The matching icons are:</p>\n";
 
-    include(PHPWEATHER_BASE_DIR . "/output/pw_icons.php");
+    include(PHPWEATHER_BASE_DIR . "/output/pw_images.php");
 
-    $icons = new pw_icons($obj, array());
+    $icons = new pw_images($obj, array());
 
     echo "<blockquote>\n";
     echo '<img src="' . $icons->get_sky_image() .

CVS: phpweather usermap,1.2,1.3

[Max H. <ir...@us...>]

Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv32062

Modified Files:
	usermap 
Log Message:
Updated my email address to what I actually use :)

Index: usermap
===================================================================
RCS file: /cvsroot/phpweather/phpweather/usermap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- usermap	17 Mar 2002 14:13:18 -0000	1.2
+++ usermap	17 Mar 2002 14:24:34 -0000	1.3
@@ -1,4 +1,4 @@
 gimpster:Martin Geisler  <gim...@gi...>
 misibacsi:Mihaly Gyulai  <gy...@my...>
-iridium:Max Hammond <ir...@us...>
+iridium:Max Hammond  <ma...@fl...>